[rhq] Branch 'code-smell' - modules/plugins
by mazz
modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 47 +++++-----
1 file changed, 25 insertions(+), 22 deletions(-)
New commits:
commit f816103dfd72e5108772459d4673eb6226cf0a19
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 14:56:55 2011 -0400
[coverity] close the pid file
diff --git a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
index e4d7575..325ed20 100644
--- a/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
+++ b/modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java
@@ -18,18 +18,6 @@
*/
package org.rhq.plugins.mysql;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.domain.measurement.DataType;
-import org.rhq.core.domain.measurement.MeasurementDataNumeric;
-import org.rhq.core.domain.measurement.MeasurementReport;
-import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-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 java.io.File;
import java.io.FileReader;
import java.sql.Connection;
@@ -43,8 +31,19 @@ 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.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.system.AggregateProcessInfo;
import org.rhq.core.system.ProcessInfo;
+import org.rhq.plugins.database.DatabaseComponent;
import org.rhq.plugins.database.DatabaseQueryUtility;
/**
@@ -129,7 +128,7 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea
} else if ("Process.aggregateMemory.size".equals(requestName)) {
long value = aggregateProcessInfo.getAggregateMemory().getSize();
report.addData(new MeasurementDataNumeric(request, new Double((double) value)));
- }else if ("Process.aggregateMemory.pageFaults".equals(requestName)) {
+ } else if ("Process.aggregateMemory.pageFaults".equals(requestName)) {
long value = aggregateProcessInfo.getAggregateMemory().getPageFaults();
report.addData(new MeasurementDataNumeric(request, new Double((double) value)));
} else if ("Process.aggregateCpu.user".equals(requestName)) {
@@ -141,12 +140,12 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea
} else if ("Process.aggregateCpu.percent".equals(requestName)) {
double value = aggregateProcessInfo.getAggregateCpu().getPercent();
report.addData(new MeasurementDataNumeric(request, new Double(value)));
- } else if ("Process.aggregateCpu.total".equals(requestName)) {
+ } else if ("Process.aggregateCpu.total".equals(requestName)) {
long value = aggregateProcessInfo.getAggregateCpu().getTotal();
- report.addData(new MeasurementDataNumeric(request, new Double((double)value)));
- }else if ("Process.aggregateFileDescriptor.total".equals(requestName)) {
+ report.addData(new MeasurementDataNumeric(request, new Double((double) value)));
+ } else if ("Process.aggregateFileDescriptor.total".equals(requestName)) {
long value = aggregateProcessInfo.getAggregateFileDescriptor().getTotal();
- report.addData(new MeasurementDataNumeric(request, new Double((double)value)));
+ report.addData(new MeasurementDataNumeric(request, new Double((double) value)));
}
} else {
if (request.getDataType() == DataType.MEASUREMENT) {
@@ -202,11 +201,15 @@ public class MySqlComponent implements DatabaseComponent, ResourceComponent, Mea
if (file.canRead()) {
try {
FileReader pidFileReader = new FileReader(file);
- char pidData[] = new char[(int)file.length()];
- pidFileReader.read(pidData);
- String pidString = new String(pidData);
- pidString = pidString.trim();
- result = Long.valueOf(pidString);
+ try {
+ char pidData[] = new char[(int) file.length()];
+ pidFileReader.read(pidData);
+ String pidString = new String(pidData);
+ pidString = pidString.trim();
+ result = Long.valueOf(pidString);
+ } finally {
+ pidFileReader.close();
+ }
} catch (Exception ex) {
log.warn("Unable to read MySQL pid file " + pidFile);
}
12 years, 9 months
[rhq] Branch 'stefan/dbreset' - etc/m2 modules/core modules/enterprise modules/jopr pom.xml release.sh
by snegrea
etc/m2/settings-bugfixes.xml | 4
etc/m2/settings-content.xml | 2
etc/m2/settings-linux-config.xml | 2
etc/m2/settings-rawconfig.xml | 4
etc/m2/settings.xml | 125 ++++++----
modules/core/dbutils/pom.xml | 86 ++++--
modules/core/domain/pom.xml | 2
modules/core/domain/src/test/resources/embedded-jboss-beans.xml | 8
modules/enterprise/gui/installer-war/pom.xml | 10
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java | 10
modules/enterprise/server/container/pom.xml | 23 -
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 20 -
modules/enterprise/server/jar/pom.xml | 2
modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 16 -
modules/jopr/release.sh | 20 -
pom.xml | 44 ++-
release.sh | 20 -
17 files changed, 248 insertions(+), 150 deletions(-)
New commits:
commit eb40603c1a83cce426644f52a7f05b2b95809cb3
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Jul 28 13:46:24 2011 -0500
Revert "Updating the code to use only one set of datasource settings. (rhq.ds.name-of-setting)"
This reverts commit 1876436d7ba7d977e7b4abfcbf223a3fb202e746.
Conflicts:
modules/core/dbutils/pom.xml
diff --git a/etc/m2/settings-bugfixes.xml b/etc/m2/settings-bugfixes.xml
index 01f3173..b64aac6 100644
--- a/etc/m2/settings-bugfixes.xml
+++ b/etc/m2/settings-bugfixes.xml
@@ -28,8 +28,8 @@
<!-- Profile to use to point test runs at a different db -->
<id>test.bugfixes</id>
<properties>
- <rhq.ds.db-name>rhqbugfixes</rhq.ds.db-name>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqbugfixes</rhq.ds.connection-url>
+ <rhq.test.ds.db-name>rhqbugfixes</rhq.test.ds.db-name>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqbugfixes</rhq.test.ds.connection-url>
<DatabaseTest.nofail>true</DatabaseTest.nofail>
<!-- comm and agent config properties -->
diff --git a/etc/m2/settings-content.xml b/etc/m2/settings-content.xml
index 3009f75..806006b 100644
--- a/etc/m2/settings-content.xml
+++ b/etc/m2/settings-content.xml
@@ -33,7 +33,7 @@
<!-- Profile to use to point test runs at a different db -->
<id>test.content</id>
<properties>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqcontent</rhq.ds.connection-url>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqcontent</rhq.test.ds.connection-url>
<DatabaseTest.nofail>true</DatabaseTest.nofail>
<!-- comm and agent config properties -->
diff --git a/etc/m2/settings-linux-config.xml b/etc/m2/settings-linux-config.xml
index 6605f33..dd464f7 100644
--- a/etc/m2/settings-linux-config.xml
+++ b/etc/m2/settings-linux-config.xml
@@ -28,7 +28,7 @@
<!-- Profile to use to point test runs at a different db -->
<id>test.linux-config</id>
<properties>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqlconf</rhq.ds.connection-url>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqlconf</rhq.test.ds.connection-url>
<DatabaseTest.nofail>true</DatabaseTest.nofail>
<!-- comm and agent config properties -->
diff --git a/etc/m2/settings-rawconfig.xml b/etc/m2/settings-rawconfig.xml
index f64b717..f871d66 100644
--- a/etc/m2/settings-rawconfig.xml
+++ b/etc/m2/settings-rawconfig.xml
@@ -28,8 +28,8 @@
<!-- Profile to use to point test runs at a different db -->
<id>test.rawconfig</id>
<properties>
- <rhq.ds.db-name>rhqrawconfig</rhq.ds.db-name>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqrawconfig</rhq.ds.connection-url>
+ <rhq.test.ds.db-name>rhqrawconfig</rhq.test.ds.db-name>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqrawconfig</rhq.test.ds.connection-url>
<DatabaseTest.nofail>true</DatabaseTest.nofail>
<!-- comm and agent config properties -->
diff --git a/etc/m2/settings.xml b/etc/m2/settings.xml
index 89c26f2..8c0dada 100644
--- a/etc/m2/settings.xml
+++ b/etc/m2/settings.xml
@@ -91,21 +91,31 @@
<profile>
<id>postgres</id>
<properties>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.server-name>127.0.0.1</rhq.ds.server-name>
- <rhq.ds.port>5432</rhq.ds.port>
- <rhq.ds.db-name>rhq</rhq.ds.db-name>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+ <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>5432</rhq.dev.ds.port>
+ <rhq.dev.ds.db-name>rhq</rhq.dev.ds.db-name>
+ <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
<rhq.dev.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.dev.quartz.selectWithLockSQL>
@@ -116,22 +126,33 @@
<profile>
<id>h2</id>
<properties>
- <rhq.ds.driver-class>org.h2.Driver</rhq.ds.driver-class>
- <rhq.ds.connection-url>jdbc:h2:~/rhq;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOG=2</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>h2</rhq.ds.type-mapping>
- <rhq.ds.xa-datasource-class>org.h2.jdbcx.JdbcDataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.server-name>127.0.0.1</rhq.ds.server-name>
- <rhq.ds.port>9092</rhq.ds.port>
- <rhq.ds.db-name>rhq</rhq.ds.db-name>
+ <rhq.test.ds.driver-class>org.h2.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.connection-url>jdbc:h2:~/rhq;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOG=2</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>h2</rhq.test.ds.type-mapping>
+ <rhq.test.ds.xa-datasource-class>org.h2.jdbcx.JdbcDataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
+ <rhq.test.ds.port>9092</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
<!-- This custom dialect is required for proper operation using H2, see class JavaDoc for more info -->
- <rhq.ds.hibernate-dialect>org.rhq.core.server.H2CustomDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.hibernate-dialect>org.rhq.core.server.H2CustomDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.StdJDBCDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
-
+
+ <rhq.dev.ds.driver-class>org.h2.Driver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.connection-url>jdbc:h2:~/rhq;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOG=2</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.type-mapping>h2</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.xa-datasource-class>org.h2.jdbcx.JdbcDataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>9092</rhq.dev.ds.port>
+ <rhq.dev.ds.db-name>rhq</rhq.dev.ds.db-name>
+ <!-- This custom dialect is required for proper operation using H2, see class JavaDoc for more info -->
+ <rhq.dev.ds.hibernate-dialect>org.rhq.core.server.H2CustomDialect</rhq.dev.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.StdJDBCDelegate</rhq.dev.quartz.driverDelegateClass>
<rhq.dev.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.dev.quartz.selectWithLockSQL>
@@ -142,21 +163,31 @@
<profile>
<id>sqlserver</id>
<properties>
- <rhq.ds.driver-class>net.sourceforge.jtds.jdbc.Driver</rhq.ds.driver-class>
- <rhq.ds.connection-url>jdbc:jtds:sqlserver://localhost:1433;databaseName=rhq</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>sqlserver</rhq.ds.type-mapping>
- <rhq.ds.xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.server-name>localhost</rhq.ds.server-name>
- <rhq.ds.port>1433</rhq.ds.port>
- <rhq.ds.db-name>rhq</rhq.ds.db-name>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.SQLServerDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.driver-class>net.sourceforge.jtds.jdbc.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.connection-url>jdbc:jtds:sqlserver://localhost:1433;databaseName=rhq</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>sqlserver</rhq.test.ds.type-mapping>
+ <rhq.test.ds.xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.server-name>localhost</rhq.test.ds.server-name>
+ <rhq.test.ds.port>1433</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.SQLServerDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.MSSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>UPDATE {0}LOCKS SET LOCK_NAME = LOCK_NAME WHERE LOCK_NAME = ?</rhq.test.quartz.selectWithLockSQL>
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.UpdateLockRowSemaphore</rhq.test.quartz.lockHandlerClass>
-
+
+ <rhq.dev.ds.driver-class>net.sourceforge.jtds.jdbc.Driver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.connection-url>jdbc:jtds:sqlserver://localhost:1433;databaseName=rhq</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.type-mapping>sqlserver</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.server-name>localhost</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>1433</rhq.dev.ds.port>
+ <rhq.dev.ds.db-name>rhq</rhq.dev.ds.db-name>
+ <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.SQLServerDialect</rhq.dev.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.MSSQLDelegate</rhq.dev.quartz.driverDelegateClass>
<rhq.dev.quartz.selectWithLockSQL>UPDATE {0}LOCKS SET LOCK_NAME = LOCK_NAME WHERE LOCK_NAME = ?</rhq.dev.quartz.selectWithLockSQL>
@@ -167,21 +198,31 @@
<profile>
<id>oracle</id>
<properties>
- <rhq.ds.connection-url>jdbc:oracle:thin:@127.0.0.1:1521:xe</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>Oracle10g</rhq.ds.type-mapping>
- <rhq.ds.driver-class>oracle.jdbc.driver.OracleDriver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.server-name></rhq.ds.server-name> <!-- can be left blank, oracle does not use this -->
- <rhq.ds.port></rhq.ds.port> <!-- can be left blank, oracle does not use this -->
- <rhq.ds.db-name></rhq.ds.db-name> <!-- can be left blank, oracle does not use this -->
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.Oracle10gDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.connection-url>jdbc:oracle:thin:@127.0.0.1:1521:xe</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>Oracle10g</rhq.test.ds.type-mapping>
+ <rhq.test.ds.driver-class>oracle.jdbc.driver.OracleDriver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.server-name></rhq.test.ds.server-name> <!-- can be left blank, oracle does not use this -->
+ <rhq.test.ds.port></rhq.test.ds.port> <!-- can be left blank, oracle does not use this -->
+ <rhq.test.ds.db-name></rhq.test.ds.db-name> <!-- can be left blank, oracle does not use this -->
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.Oracle10gDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.oracle.OracleDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+ <rhq.dev.ds.connection-url>jdbc:oracle:thin:@127.0.0.1:1521:xe</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.type-mapping>Oracle10g</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.driver-class>oracle.jdbc.driver.OracleDriver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.server-name></rhq.dev.ds.server-name> <!-- can be left blank, oracle does not use this -->
+ <rhq.dev.ds.port></rhq.dev.ds.port> <!-- can be left blank, oracle does not use this -->
+ <rhq.dev.ds.db-name></rhq.dev.ds.db-name> <!-- can be left blank, oracle does not use this -->
+ <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.Oracle10gDialect</rhq.dev.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.oracle.OracleDelegate</rhq.dev.quartz.driverDelegateClass>
<rhq.dev.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.dev.quartz.selectWithLockSQL>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 4d2f4ca..996ae31 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -241,12 +241,23 @@
<phase>process-classes</phase>
<configuration>
<tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository}"/>
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}"/>
- <property name="rhq.ds.db-name" value="${rhq.ds.db-name}"/>
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}"/>
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}"/>
- <property name="rhq.ds.password" value="${rhq.ds.password}"/>
+ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
<property name="settings.localRepository" value="${settings.localRepository}" />
@@ -279,14 +290,28 @@
<id>test-db-schema-version</id>
<phase>test</phase>
<configuration>
- <tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.db-name" value="${rhq.ds.db-name}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
- <property name="rhq.ds.driver-class" value="${rhq.ds.driver-class}" />
+ <tasks>
+ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.driver-class" value="${rhq.dev.ds.driver-class}" else="${rhq.test.ds.driver-class}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
@@ -334,13 +359,24 @@
<phase>test</phase>
<configuration>
<tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.db-name" value="${rhq.ds.db-name}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
-
+ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev" />
+ </condition>
+
<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}" />
@@ -355,10 +391,10 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
- <property name="jon.release" value="${jon.release}" />
- </ant>
- </tasks>
- </configuration>
+ <property name="jon.release" value="${jon.release}" />
+ </ant>
+ </tasks>
+ </configuration>
<goals>
<goal>run</goal>
</goals>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index c8ce307..42d28e1 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -282,7 +282,7 @@
</property>
<property>
<name>hibernate.dialect</name>
- <value>${rhq.ds.hibernate-dialect}</value>
+ <value>${rhq.test.ds.hibernate-dialect}</value>
</property>
</systemProperties>
<excludes>
diff --git a/modules/core/domain/src/test/resources/embedded-jboss-beans.xml b/modules/core/domain/src/test/resources/embedded-jboss-beans.xml
index a51f3e3..ae9de01 100644
--- a/modules/core/domain/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/core/domain/src/test/resources/embedded-jboss-beans.xml
@@ -85,10 +85,10 @@
-->
<bean name="RHQDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">${rhq.ds.driver-class}</property>
- <property name="connectionURL">${rhq.ds.connection-url}</property>
- <property name="userName">${rhq.ds.user-name}</property>
- <property name="password">${rhq.ds.password}</property>
+ <property name="driverClass">${rhq.test.ds.driver-class}</property>
+ <property name="connectionURL">${rhq.test.ds.connection-url}</property>
+ <property name="userName">${rhq.test.ds.user-name}</property>
+ <property name="password">${rhq.test.ds.password}</property>
<property name="jndiName">java:/RHQDS</property>
<property name="minSize">0</property>
<property name="maxSize">10</property>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index f73e403..517399c 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -147,13 +147,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <rhq.ds.server-name>${rhq.ds.server-name}</rhq.ds.server-name>
- <rhq.ds.db-name>${rhq.ds.db-name}</rhq.ds.db-name>
- <rhq.ds.connection-url>${rhq.ds.connection-url}</rhq.ds.connection-url>
+ <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.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.ds.user-name>${rhq.ds.user-name}</rhq.ds.user-name>
- <rhq.ds.password>${rhq.ds.password}</rhq.ds.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>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java
index 0e68830..579bebf 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallatonTest.java
@@ -46,11 +46,11 @@ import java.util.Properties;
public class DBInstallatonTest {
private final String LOG_DIRECTORY = System.getProperty("java.io.tmpdir", "rhq/installer-test");
- private final String TEST_DB = System.getProperty("rhq.ds.db-name","rhq_installer_test_db");
- private final String USERNAME = System.getProperty("rhq.ds.user-name", "rhqadmin");
- private final String PASSWORD = System.getProperty("rhq.ds.password", "rhqadmin");
- private final String SERVER = System.getProperty("rhq.ds.server-name", "127.0.0.1");
- private final String DB_URL = System.getProperty("rhq.ds.connection-url", "jdbc:postgresql://" + SERVER + ":5432/"+TEST_DB);
+ private final String TEST_DB = 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.test.ds.connection-url", "jdbc:postgresql://" + SERVER + ":5432/"+TEST_DB);
private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 8e59747..7329bb5 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -183,16 +183,16 @@
<property name="quartz.version" value="${quartz.version}" />
<!-- dev DB settings (used to init rhq-server.properties if dev profile is active or developer prop is set) -->
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.driver-class" value="${rhq.ds.driver-class}" />
- <property name="rhq.ds.xa-datasource-class" value="${rhq.ds.xa-datasource-class}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password.encrypted" value="${rhq.ds.password.encrypted}" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.server-name" value="${rhq.ds.server-name}" />
- <property name="rhq.ds.port" value="${rhq.ds.port}" />
- <property name="rhq.ds.db-name" value="${rhq.ds.db-name}" />
- <property name="rhq.ds.hibernate-dialect" value="${rhq.ds.hibernate-dialect}" />
+ <property name="rhq.dev.ds.connection-url" value="${rhq.dev.ds.connection-url}" />
+ <property name="rhq.dev.ds.driver-class" value="${rhq.dev.ds.driver-class}" />
+ <property name="rhq.dev.ds.xa-datasource-class" value="${rhq.dev.ds.xa-datasource-class}" />
+ <property name="rhq.dev.ds.user-name" value="${rhq.dev.ds.user-name}" />
+ <property name="rhq.dev.ds.password.encrypted" value="${rhq.dev.ds.password.encrypted}" />
+ <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" />
+ <property name="rhq.dev.ds.server-name" value="${rhq.dev.ds.server-name}" />
+ <property name="rhq.dev.ds.port" value="${rhq.dev.ds.port}" />
+ <property name="rhq.dev.ds.db-name" value="${rhq.dev.ds.db-name}" />
+ <property name="rhq.dev.ds.hibernate-dialect" value="${rhq.dev.ds.hibernate-dialect}" />
<property name="rhq.dev.quartz.driverDelegateClass" value="${rhq.dev.quartz.driverDelegateClass}" />
<property name="rhq.dev.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" />
<property name="rhq.dev.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" />
@@ -233,7 +233,8 @@
<property name="rhq.earName" value="${rhq.earName}" />
<!-- dev/test DB type (needed to init rhq-ds.xml) -->
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.test.ds.type-mapping" value="${rhq.test.ds.type-mapping}" />
+ <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" />
<property name="rhq.server.enable.web.services" value="${rhq.server.enable.ws}" />
</ant>
</tasks>
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 c4d83a0..704c50a 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
@@ -33,16 +33,16 @@
<target name="set-dev-server-props" if="predeploy">
<echo>*** Using dev database settings in rhq-server.properties...</echo>
- <property name="rhq.server.database.hibernate-dialect" value="${rhq.ds.hibernate-dialect}" />
- <property name="rhq.server.database.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.server.database.driver-class" value="${rhq.ds.driver-class}" />
- <property name="rhq.server.database.xa-datasource-class" value="${rhq.ds.xa-datasource-class}" />
- <property name="rhq.server.database.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.server.database.password" value="${rhq.ds.password.encrypted}" />
- <property name="rhq.server.database.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.server.database.server-name" value="${rhq.ds.server-name}" />
- <property name="rhq.server.database.port" value="${rhq.ds.port}" />
- <property name="rhq.server.database.db-name" value="${rhq.ds.db-name}" />
+ <property name="rhq.server.database.hibernate-dialect" value="${rhq.dev.ds.hibernate-dialect}" />
+ <property name="rhq.server.database.connection-url" value="${rhq.dev.ds.connection-url}" />
+ <property name="rhq.server.database.driver-class" value="${rhq.dev.ds.driver-class}" />
+ <property name="rhq.server.database.xa-datasource-class" value="${rhq.dev.ds.xa-datasource-class}" />
+ <property name="rhq.server.database.user-name" value="${rhq.dev.ds.user-name}" />
+ <property name="rhq.server.database.password" value="${rhq.dev.ds.password.encrypted}" />
+ <property name="rhq.server.database.type-mapping" value="${rhq.dev.ds.type-mapping}" />
+ <property name="rhq.server.database.server-name" value="${rhq.dev.ds.server-name}" />
+ <property name="rhq.server.database.port" value="${rhq.dev.ds.port}" />
+ <property name="rhq.server.database.db-name" value="${rhq.dev.ds.db-name}" />
<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}" />
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 000808c..c5bb3ec 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -559,7 +559,7 @@ Build-OS-Version=${os.version}
<systemPropertyVariables>
<embeddedDeployment>true</embeddedDeployment>
<deploymentDirectory>target/classes</deploymentDirectory>
- <hibernate.dialect>${rhq.ds.hibernate-dialect}</hibernate.dialect>
+ <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
<clean.db>${clean.db}</clean.db>
</systemPropertyVariables>
<additionalClasspathElements>
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 05451bd..55d697b 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
@@ -76,10 +76,10 @@
</bean>
<bean name="RHQDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">${rhq.ds.driver-class}</property>
- <property name="connectionURL">${rhq.ds.connection-url}</property>
- <property name="userName">${rhq.ds.user-name}</property>
- <property name="password">${rhq.ds.password}</property>
+ <property name="driverClass">${rhq.test.ds.driver-class}</property>
+ <property name="connectionURL">${rhq.test.ds.connection-url}</property>
+ <property name="userName">${rhq.test.ds.user-name}</property>
+ <property name="password">${rhq.test.ds.password}</property>
<property name="jndiName">java:/RHQDS</property>
<property name="minSize">0</property>
<property name="maxSize">20</property>
@@ -104,10 +104,10 @@
<!-- needed for Quartz' no-TX data source (even though this is a local-tx, seems like Quartz is still working) -->
<bean name="NoTxRHQDSBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property name="driverClass">${rhq.ds.driver-class}</property>
- <property name="connectionURL">${rhq.ds.connection-url}</property>
- <property name="userName">${rhq.ds.user-name}</property>
- <property name="password">${rhq.ds.password}</property>
+ <property name="driverClass">${rhq.test.ds.driver-class}</property>
+ <property name="connectionURL">${rhq.test.ds.connection-url}</property>
+ <property name="userName">${rhq.test.ds.user-name}</property>
+ <property name="password">${rhq.test.ds.password}</property>
<property name="jndiName">java:/NoTxRHQDS</property>
<property name="minSize">0</property>
<property name="maxSize">10</property>
diff --git a/modules/jopr/release.sh b/modules/jopr/release.sh
index c05b6ee..54f26ab 100755
--- a/modules/jopr/release.sh
+++ b/modules/jopr/release.sh
@@ -226,16 +226,16 @@ cat <<EOF >${SETTINGS}
<profile>
<id>release</id>
<properties>
- <rhq.ds.connection-url>jdbc:postgresql://jon03.qa.atl2.redhat.com:5432/rhq_release</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.server-name>jon03.qa.atl2.redhat.com</rhq.ds.server-name>
- <rhq.ds.port>5432</rhq.ds.port>
- <rhq.ds.db-name>rhq_release</rhq.ds.db-name>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.connection-url>jdbc:postgresql://jon03.qa.atl2.redhat.com:5432/rhq_release</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.server-name>jon03.qa.atl2.redhat.com</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq_release</rhq.test.ds.db-name>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
diff --git a/pom.xml b/pom.xml
index 23afa62..549e0d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,22 +107,42 @@
defaults for datasource used by integration tests -
these may be overridden in ~/.m2/settings.xml
-->
- <rhq.ds.db-name>rhq</rhq.ds.db-name>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.ds.db-name}</rhq.ds.connection-url>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.ds.password.encrypted>
- <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
- <rhq.ds.server-name>127.0.0.1</rhq.ds.server-name>
- <rhq.ds.port>5432</rhq.ds.port>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.test.ds.db-name}</rhq.test.ds.connection-url>
+ <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>
SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE
</rhq.test.quartz.selectWithLockSQL>
- <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+ <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+
+ <!--
+ defaults for datasource used by the dev container build (see dev docs on the 'dev' profile) -
+ these may be overridden in ~/.m2/settings.xml
+ -->
+ <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
+ <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.dev.ds.db-name}</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.dev.ds.password.encrypted>
+ <rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>5432</rhq.dev.ds.port>
+ <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
+ <rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
+ <rhq.dev.quartz.selectWithLockSQL>
+ SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE
+ </rhq.dev.quartz.selectWithLockSQL>
+ <rhq.dev.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.dev.quartz.lockHandlerClass>
<!-- default port numbers for RHQ server -->
<rhq.server.http.port>7080</rhq.server.http.port>
diff --git a/release.sh b/release.sh
index 4c7166e..316af14 100755
--- a/release.sh
+++ b/release.sh
@@ -282,16 +282,16 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}"
<profile>
<id>release</id>
<properties>
- <rhq.ds.server-name>hudson-qe.rhq.rdu.redhat.com</rhq.ds.server-name>
- <rhq.ds.port>5432</rhq.ds.port>
- <rhq.ds.db-name>rhq_release_tag</rhq.ds.db-name>
- <rhq.ds.connection-url>jdbc:postgresql://hudson-qe.rhq.rdu.redhat.com:5432/rhq_release_tag</rhq.ds.connection-url>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
+ <rhq.test.ds.server-name>hudson-qe.rhq.rdu.redhat.com</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq_release_tag</rhq.test.ds.db-name>
+ <rhq.test.ds.connection-url>jdbc:postgresql://hudson-qe.rhq.rdu.redhat.com:5432/rhq_release_tag</rhq.test.ds.connection-url>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
<!-- quartz properties -->
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
12 years, 9 months
[rhq] Branch 'code-smell' - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java | 13 +++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java | 16 +++++-----
2 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit bd2129db2d7f4e76efc938986674d24beebd1b4f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 14:28:47 2011 -0400
[coverity] not really necessary I don't think - seems like Bundle Manager Bean closes the stream for us. but just in case...
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java
index 71ff5f4..3081883 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java
@@ -58,11 +58,14 @@ public class BundleFileUploadServlet extends FileUploadServlet {
String version = getFormField(formFields, "version", Integer.toString(bundleVersionId));
Architecture architecture = new Architecture(getFormField(formFields, "arch", "noarch"));
InputStream fileStream = new FileInputStream(file);
-
- BundleManagerLocal bundleManager = LookupUtil.getBundleManager();
- BundleFile bundleFile = bundleManager.addBundleFile(subject, bundleVersionId, name, version, architecture,
- fileStream);
- successMsg = "success [" + bundleFile.getId() + "]";
+ try {
+ BundleManagerLocal bundleManager = LookupUtil.getBundleManager();
+ BundleFile bundleFile = bundleManager.addBundleFile(subject, bundleVersionId, name, version,
+ architecture, fileStream);
+ successMsg = "success [" + bundleFile.getId() + "]";
+ } finally {
+ fileStream.close(); // I don't think this is necessary (seems BundleManager closes it for us) but do it anyway just in case
+ }
} catch (Exception e) {
writeExceptionResponse(response, "Failed to upload bundle file", e); // clients will look for this string!
return;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java
index 9aed016..0795914 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletResponse;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.content.PackageVersion;
import org.rhq.enterprise.server.content.ContentManagerLocal;
-import org.rhq.enterprise.server.content.RepoManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -73,8 +72,6 @@ public class PackageVersionFileUploadServlet extends FileUploadServlet {
if (repoIdS != null) {
repoId = Integer.parseInt(repoIdS);
}
-
- InputStream fileStream = new FileInputStream(file);
//use getUploadedPackageVersion instead of createPackageVersion here
//because createPackageVersion successfully returns an already existing
@@ -84,10 +81,15 @@ public class PackageVersionFileUploadServlet extends FileUploadServlet {
Map<String, String> metaData = new HashMap<String, String>();
metaData.put(ContentManagerLocal.UPLOAD_FILE_INSTALL_DATE, Long.toString(file.lastModified()));
metaData.put(ContentManagerLocal.UPLOAD_FILE_NAME, packageName);
- PackageVersion packageVersion = contentManager.getUploadedPackageVersion(subject, packageName,
- packageTypeId, version, architectureId, fileStream, metaData, repoId);
-
- successMsg = "success [packageVersionId=" + packageVersion.getId() + ",packageId=" + packageVersion.getGeneralPackage().getId() + "]";
+ InputStream fileStream = new FileInputStream(file);
+ try {
+ PackageVersion packageVersion = contentManager.getUploadedPackageVersion(subject, packageName,
+ packageTypeId, version, architectureId, fileStream, metaData, repoId);
+ successMsg = "success [packageVersionId=" + packageVersion.getId() + ",packageId="
+ + packageVersion.getGeneralPackage().getId() + "]";
+ } finally {
+ fileStream.close();
+ }
} catch (Exception e) {
writeExceptionResponse(response, "Failed to upload file", e); // clients will look for this string!
return;
12 years, 9 months
[rhq] Branch 'code-smell' - modules/core
by mazz
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java | 24 +++++++---
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit c59a821e4bc8ee18d19262f4c5887af6545eb5de
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 14:19:06 2011 -0400
[coverity] make sure we close the input stream
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java
index d4c055f..9a0c91b 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java
@@ -20,6 +20,7 @@ package org.rhq.core.db.ant.dbupgrade;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -28,9 +29,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+
import mazz.i18n.Msg;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
+
import org.rhq.core.db.DatabaseType;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.db.DbUtil;
@@ -70,16 +74,16 @@ public class DBUpgrader extends Task {
private Connection connection;
private boolean doCloseConnection;
-
+
public DBUpgrader() {
doCloseConnection = true;
}
-
+
public DBUpgrader(Connection connection) {
this.connection = connection;
doCloseConnection = false;
}
-
+
/**
* The URL to the database that is to be upgraded.
*
@@ -339,12 +343,20 @@ public class DBUpgrader extends Task {
if (typeMapFile == null) {
typeMaps = TypeMap.loadKnownTypeMaps();
} else {
+ FileInputStream fis = null;
try {
- FileInputStream fis = new FileInputStream(typeMapFile);
+ fis = new FileInputStream(typeMapFile);
typeMaps = TypeMap.loadTypeMapsFromStream(fis);
} catch (Exception e) {
throw new BuildException(MSG.getMsg(DbAntI18NResourceKeys.DBUPGRADE_TYPE_MAP_FILE_ERROR, typeMapFile
.getAbsolutePath(), e), e);
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ }
+ }
}
}
@@ -461,7 +473,7 @@ public class DBUpgrader extends Task {
if (connection == null) {
connection = DbUtil.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
}
- return connection;
+ return connection;
}
/**
@@ -474,7 +486,7 @@ public class DBUpgrader extends Task {
this.connection = connection;
doCloseConnection = connection == null;
}
-
+
/**
* Returns the type of database that is being upgraded.
*
12 years, 9 months
[rhq] Branch 'code-smell' - modules/core
by mazz
modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fb8f4905912ba0bbc63d1aabc8dae84e10619b32
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 14:12:13 2011 -0400
[coverity] just a test class, but it should still close the stream to be a good citizen
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java b/modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java
index 4bada6d..8ddcf1e 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java
@@ -74,7 +74,9 @@ public class ZipUtilTest {
destFile.mkdirs();
} else {
destFile.getParentFile().mkdirs();
- StreamUtil.copy(stream, new FileOutputStream(destFile), false);
+ FileOutputStream fos = new FileOutputStream(destFile);
+ StreamUtil.copy(stream, fos, false);
+ fos.close();
}
return true;
}
12 years, 9 months
[rhq] Branch 'code-smell' - modules/core modules/enterprise
by mazz
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java | 12 +++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 14 +++++-----
2 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 7db43fdbd624ec1227a1d7745b67b59f39a9fe1e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 14:07:38 2011 -0400
[coverity] paranoia - just make sure we always close the file stream, avoiding the possibility that Buffered stream constructor bombs would leave the file stream open
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java
index 25be7de..a9b07f2 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java
@@ -205,21 +205,24 @@ public class PluginClassLoader extends URLClassLoader {
}
}
- BufferedOutputStream outputStream;
+ FileOutputStream fileOutputStream;
try {
- outputStream = new BufferedOutputStream(new FileOutputStream(file));
+ fileOutputStream = new FileOutputStream(file);
} catch (FileNotFoundException ex) {
if (file.exists() && (file.length() > 0)) {
// e.g. on win32, agent running w/ dll loaded PluginDumper cannot overwrite file inuse.
continue;
}
-
throw ex;
}
+ BufferedOutputStream outputStream = new BufferedOutputStream(fileOutputStream);
try {
file.deleteOnExit();
+ // do NOT close this inputStream since it is buffering the ZipInputStream
+ // and we are going to still process that input stream later. We close
+ // this ZipInputStream down below in the outer most try-finally block.
BufferedInputStream inputStream = new BufferedInputStream(zis);
int count;
@@ -229,13 +232,12 @@ public class PluginClassLoader extends URLClassLoader {
}
} finally {
outputStream.flush();
- outputStream.close();
+ outputStream.close(); // this also closes the fileOutputStream
}
} catch (IOException ioe) {
if (file != null) {
file.delete();
}
-
throw ioe;
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
index fa26970..90e2117 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java
@@ -133,37 +133,39 @@ public class ServerPluginClassLoader extends URLClassLoader {
}
}
- BufferedOutputStream outputStream;
+ FileOutputStream fileOutputStream;
try {
- outputStream = new BufferedOutputStream(new FileOutputStream(file));
+ fileOutputStream = new FileOutputStream(file);
} catch (FileNotFoundException ex) {
if (file.exists() && (file.length() > 0)) {
// e.g. on win32, agent running w/ dll loaded PluginDumper cannot overwrite file inuse.
continue;
}
-
throw ex;
}
+ BufferedOutputStream outputStream = new BufferedOutputStream(fileOutputStream);
try {
file.deleteOnExit();
+ // do NOT close this inputStream since it is buffering the ZipInputStream
+ // and we are going to still process that input stream later. We close
+ // this ZipInputStream down below in the outer most try-finally block.
BufferedInputStream inputStream = new BufferedInputStream(zis);
- int count = 0;
+ int count;
byte[] b = new byte[8192];
while ((count = inputStream.read(b)) > -1) {
outputStream.write(b, 0, count);
}
} finally {
outputStream.flush();
- outputStream.close();
+ outputStream.close(); // this also closes the fileOutputStream
}
} catch (IOException ioe) {
if (file != null) {
file.delete();
}
-
throw ioe;
}
}
12 years, 9 months
[rhq] Branch 'AdminConsole_EAP_5_1' - modules/plugins
by ips
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 12 ++++------
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 11 +++++----
2 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 47528510e87e1f3ab3f7ef609c119a563c789856
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Jul 28 13:29:17 2011 -0400
[BZ 616071] improve debug logging in getAvailablity() impls (https://bugzilla.redhat.com/show_bug.cgi?id=616071)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
index e7a1194..2193b67 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
@@ -1,6 +1,6 @@
/*
* Jopr Management Platform
- * Copyright (C) 2005-2009 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
@@ -107,19 +107,17 @@ public abstract class AbstractManagedDeploymentComponent extends AbstractManaged
DeploymentState deploymentState = null;
try {
deploymentState = getManagedDeployment().getDeploymentState();
- } catch (NoSuchDeploymentException e) {
- log.warn(this.deploymentType + " deployment '" + this.deploymentName + "' not found. Cause: "
- + e.getLocalizedMessage());
- return AvailabilityType.DOWN;
} catch (Throwable t) {
- log.debug("Could not get deployment state, cause: ", t);
+ log.debug("Could not get deployment state for " + this.deploymentType + " deployment '"
+ + this.deploymentName + "', cause: ", t);
return AvailabilityType.DOWN;
}
if (deploymentState == DeploymentState.STARTED) {
return AvailabilityType.UP;
} else {
- log.debug("Deployment was not STARTED, state was: " + deploymentState);
+ log.debug(this.deploymentType + " deployment '" + this.deploymentName +
+ "' was not running, state was: " + deploymentState);
return AvailabilityType.DOWN;
}
}
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 fb292ee..56c59cb 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
@@ -1,6 +1,6 @@
/*
* Jopr Management Platform
-* Copyright (C) 2005-2009 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
@@ -104,18 +104,19 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen
// ResourceComponent Implementation --------------------------------------------
public AvailabilityType getAvailability() {
- RunState runState = null;
+ RunState runState;
try {
runState = getManagedComponent().getRunState();
} catch (Throwable t) {
- log.debug("Could not get component state, cause: ", t);
+ log.debug("Could not get component state for " + this.componentType + " component '"
+ + this.componentName + "', cause: ", t);
return AvailabilityType.DOWN;
}
-
if (runState == RunState.RUNNING) {
return AvailabilityType.UP;
} else {
- log.debug("Component was not running, state was: " + runState);
+ log.debug(this.componentType + " component '" + this.componentName + "' was not running, state" +
+ " was: " + runState);
return AvailabilityType.DOWN;
}
}
12 years, 9 months
[rhq] Branch 'code-smell' - modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2f53d69eccc94ffa068ed1483ca3d7d6db9d776e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 13:00:09 2011 -0400
opps, fix comment
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index e2fc414..5697374 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -939,7 +939,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return server_configuration;
} finally {
- // we know this isn't non-null; if it was, we would have thrown the IOException earlier.
+ // we know this is not null; if it was, we would have thrown the IOException earlier.
config_file_input_stream.close();
}
}
12 years, 9 months
[rhq] Branch 'code-smell' - modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 63 +++++-----
1 file changed, 34 insertions(+), 29 deletions(-)
New commits:
commit b09ab768bc1d84ab27476536237f28e09506387f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jul 28 12:58:59 2011 -0400
[coverity] close the config file input stream
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index 29116d8..e2fc414 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -439,12 +439,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
try {
ClientCommandSenderConfiguration sender_config = getSenderConfiguration(agent);
if (sender_config.commandSpoolFileName != null) {
- spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
- if (spool_file.exists()) {
- // first truncate it, in case Windows is locking it; then try to delete
- new FileOutputStream(spool_file, false).close();
- spool_file.delete();
- }
+ spool_file = new File(sender_config.dataDirectory, sender_config.commandSpoolFileName);
+ if (spool_file.exists()) {
+ // first truncate it, in case Windows is locking it; then try to delete
+ new FileOutputStream(spool_file, false).close();
+ spool_file.delete();
+ }
}
} catch (Exception e) {
LOG.warn("Failed to truncate/delete spool for deleted agent [" + agent + "]"
@@ -907,36 +907,41 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
// 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.
- Preferences preferences_node = getPreferencesNode();
- ByteArrayOutputStream backup = new ByteArrayOutputStream();
- preferences_node.exportSubtree(backup);
- preferences_node.clear();
-
- // now load in the preferences
try {
- Preferences.importPreferences(config_file_input_stream);
+ Preferences preferences_node = getPreferencesNode();
+ ByteArrayOutputStream backup = new ByteArrayOutputStream();
+ preferences_node.exportSubtree(backup);
+ preferences_node.clear();
- if (new ServerConfiguration(preferences_node).getServerConfigurationVersion() == 0) {
- throw new IllegalArgumentException(LOG.getMsgString(
- ServerI18NResourceKeys.BAD_NODE_NAME_IN_CONFIG_FILE, file_name, preferences_node_name));
- }
- } catch (Exception e) {
- // a problem occurred importing the config file; let's restore our original values
+ // now load in the preferences
try {
- Preferences.importPreferences(new ByteArrayInputStream(backup.toByteArray()));
- } catch (Exception e1) {
- // its conceivable the same problem occurred here as with the original exception (backing store problem?)
- // let's throw the original exception, not this one
- }
+ Preferences.importPreferences(config_file_input_stream);
- throw e;
- }
+ if (new ServerConfiguration(preferences_node).getServerConfigurationVersion() == 0) {
+ throw new IllegalArgumentException(LOG.getMsgString(
+ ServerI18NResourceKeys.BAD_NODE_NAME_IN_CONFIG_FILE, file_name, preferences_node_name));
+ }
+ } catch (Exception e) {
+ // a problem occurred importing the config file; let's restore our original values
+ try {
+ Preferences.importPreferences(new ByteArrayInputStream(backup.toByteArray()));
+ } catch (Exception e1) {
+ // its conceivable the same problem occurred here as with the original exception (backing store problem?)
+ // let's throw the original exception, not this one
+ }
- ServerConfiguration server_configuration = new ServerConfiguration(preferences_node);
+ throw e;
+ }
- LOG.debug(ServerI18NResourceKeys.LOADED_CONFIG_FILE, file_name);
+ ServerConfiguration server_configuration = new ServerConfiguration(preferences_node);
- return server_configuration;
+ LOG.debug(ServerI18NResourceKeys.LOADED_CONFIG_FILE, file_name);
+
+ return server_configuration;
+ } finally {
+ // we know this isn't non-null; if it was, we would have thrown the IOException earlier.
+ config_file_input_stream.close();
+ }
}
/**
12 years, 9 months
[rhq] Branch 'AdminConsole_EAP_5_1' - modules/core
by ips
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java | 4 ++++
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 9 +++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit f1bb1cc031e7efcc881db08c1773dc1672a285b3
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Jul 28 12:55:53 2011 -0400
[BZ 710230] don't ask plugin for client jar urls if per-resource classloading is disabled (https://bugzilla.redhat.com/show_bug.cgi?id=710230)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java
index aec2353..31063e6 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java
@@ -463,6 +463,10 @@ public class ClassLoaderManager {
return new HashMap<CanonicalResourceKey, ClassLoader>(this.resourceClassLoaders);
}
+ public boolean isCreateResourceClassLoaders() {
+ return createResourceClassLoaders;
+ }
+
private Set<ClassLoader> getUniquePluginClassLoaders() {
HashSet<ClassLoader> uniqueClassLoaders = new HashSet<ClassLoader>(this.pluginClassLoaders.values());
return uniqueClassLoaders;
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java
index 4176353..8163e5d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.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
@@ -181,7 +181,12 @@ public class PluginComponentFactory implements ContainerService {
}
// get the classloader the resource should use
- List<URL> additionalJars = askDiscoveryComponentForAdditionalClasspathUrls(resource, parentContainer);
+ List<URL> additionalJars;
+ if (classLoaderMgr.isCreateResourceClassLoaders()) {
+ additionalJars = askDiscoveryComponentForAdditionalClasspathUrls(resource, parentContainer);
+ } else {
+ additionalJars = null;
+ }
ClassLoader cl = classLoaderMgr.obtainResourceClassLoader(resource, parentContainer, additionalJars);
return cl;
} catch (Throwable t) {
12 years, 9 months