rendered paste bodyIndex: modules/enterprise/gui/installer-war/pom.xml
===================================================================
--- modules/enterprise/gui/installer-war/pom.xml (revision 879)
+++ modules/enterprise/gui/installer-war/pom.xml (working copy)
@@ -329,4 +329,4 @@
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Index: modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerConnection.java
===================================================================
--- modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerConnection.java (revision 879)
+++ modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerConnection.java (working copy)
@@ -465,4 +465,67 @@
return new LoggerPreparedStatement(loggerDriver, realConnection, results, sql);
}
-}
\ No newline at end of file
+
+ public java.sql.Struct createStruct(java.lang.String str, java.lang.Object[] obj)
+ {
+ return null;
+ }
+
+ public java.sql.Array createArrayOf(java.lang.String str, java.lang.Object[] objs)
+ {
+ return null;
+ }
+
+ public java.util.Properties getClientInfo()
+ {
+ return null;
+ }
+
+ public java.lang.String getClientInfo(java.lang.String str)
+ {
+ return null;
+ }
+
+ public void setClientInfo(java.util.Properties prop)
+ {
+ }
+
+ public void setClientInfo(java.lang.String str, java.lang.String str2)
+ {
+ }
+
+ private boolean isValid;
+ public boolean isValid(int i){
+ return isValid;
+ }
+
+ public java.sql.SQLXML createSQLXML()
+ {
+ return null;
+ }
+
+ public java.sql.NClob createNClob()
+ {
+ return null;
+ }
+
+ public java.sql.Blob createBlob()
+ {
+ return null;
+ }
+
+ public java.sql.Clob createClob()
+ {
+ return null;
+ }
+
+ public <T> T unwrap(java.lang.Class<T> obj)
+ {
+ return null;
+ }
+
+ public boolean isWrapperFor(java.lang.Class<?> c)
+ {
+ return false;
+ }
+}
Index: modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerStatement.java
===================================================================
--- modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerStatement.java (revision 879)
+++ modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerStatement.java (working copy)
@@ -460,4 +460,37 @@
log("getResultSetHoldability() -> " + results);
return results;
}
-}
\ No newline at end of file
+
+ private boolean isPoolable;
+ public boolean isPoolable()
+ {
+ return isPoolable;
+ }
+
+ public void setPoolable(boolean pool)
+ {
+ isPoolable=pool;
+ }
+
+ private boolean isClosed;
+ public boolean isClosed()
+ {
+ return isClosed;
+ }
+
+ public void setIsClosed(boolean v)
+ {
+ isClosed=v;
+ }
+
+ public boolean isWrapperFor(java.lang.Class<?> c)
+ {
+ return false;
+ }
+
+ public <T> T unwrap(java.lang.Class<T> obj)
+ {
+ return null;
+ }
+
+}
Index: modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerPreparedStatement.java
===================================================================
--- modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerPreparedStatement.java (revision 879)
+++ modules/core/dbutils/src/main/java/org/rhq/core/db/log/LoggerPreparedStatement.java (working copy)
@@ -468,4 +468,76 @@
log("getParameterMetaData() -> " + results);
return results;
}
-}
\ No newline at end of file
+
+ public void setNClob(int i, java.sql.NClob b)
+ {
+ }
+
+ public void setNClob(int i, java.io.Reader r)
+ {
+ }
+
+ public void setBlob(int i, java.io.InputStream s)
+ {
+ }
+
+ public void setClob(int i, java.io.Reader r)
+ {
+ }
+
+ public void setNClob(int i, java.io.Reader r, long l)
+ {
+ }
+
+ public void setBlob(int i, java.io.InputStream s, long l)
+ {
+ }
+
+ public void setClob(int i, java.io.Reader r, long l)
+ {
+ }
+
+ public void setNCharacterStream(int i, java.io.Reader r)
+ {
+ }
+
+ public void setNCharacterStream(int i, java.io.Reader r, long l)
+ {
+ }
+
+ public void setCharacterStream(int i, java.io.Reader r, long l)
+ {
+ }
+
+ public void setCharacterStream(int i, java.io.Reader r)
+ {
+ }
+
+ public void setBinaryStream(int i, java.io.InputStream s)
+ {
+ }
+
+ public void setBinaryStream(int i, java.io.InputStream s, long l)
+ {
+ }
+
+ public void setAsciiStream(int i, java.io.InputStream r, long l)
+ {
+ }
+
+ public void setAsciiStream(int i, java.io.InputStream r)
+ {
+ }
+
+ public void setSQLXML(int i, java.sql.SQLXML x)
+ {
+ }
+
+ public void setNString(int i, java.lang.String s)
+ {
+ }
+
+ public void setRowId(int i, java.sql.RowId id)
+ {
+ }
+}
Index: pom.xml
===================================================================
--- pom.xml (revision 879)
+++ pom.xml (working copy)
@@ -356,11 +356,10 @@
<source>1.5</source>
<target>1.5</target>
<!-- To build using JDK 6, set the java5.home property to your JDK 5 jre dir (i.e. C:/opt/jdk-1.5.0_11/jre) and uncomment the below block. -->
- <!--
- <compilerArguments>
+ <compilerArguments>
<bootclasspath>${java5.home}/lib/rt.jar${path.separator}${java5.home}/lib/jsse.jar${path.separator}${java5.home}/lib/jce.jar</bootclasspath>
</compilerArguments>
- -->
+ <encoding>utf-8</encoding>
</configuration>
</plugin>
@@ -397,7 +396,7 @@
<version>2.0</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.5,1.6)</version> <!-- 1.5.x -->
+ <version>1.6.0-5</version> <!-- 1.5.x -->
</requireJavaVersion>
</rules>
</configuration>
@@ -588,4 +587,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
Index: etc/eclipse-tools/hibernate.cfg.xml
===================================================================
--- etc/eclipse-tools/hibernate.cfg.xml (revision 879)
+++ etc/eclipse-tools/hibernate.cfg.xml (working copy)
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
- <session-factory>
- <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/rhq</property>
- <property name="hibernate.connection.username">rhqadmin</property>
- <property name="hibernate.connection.password">rhqadmin</property>
- <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
- <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
- <property name="hibernate.default_schema">public</property>
-
- <!--
- <property name="hibernate.connection.url">jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</property>
- <property name="hibernate.connection.username">***</property>
- <property name="hibernate.connection.password">***</property>
- <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
- <property name="hibernate.dialect">org.hibernate.dialect.OracleDialect</property>
- -->
-
- <property name="hibernate.cache.use_second_level_cache">false</property>
- <property name="hibernate.cache.use_query_cache">false</property>
-
- <mapping class="org.rhq.core.domain.auth.Principal" />
- <mapping class="org.rhq.core.domain.auth.Subject" />
- <mapping class="org.rhq.core.domain.authz.Role" />
- <mapping class="org.rhq.core.domain.common.SystemConfiguration" />
- <mapping class="org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.configuration.Configuration" />
- <mapping class="org.rhq.core.domain.configuration.PluginConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.configuration.Property" />
- <mapping class="org.rhq.core.domain.configuration.PropertyList" />
- <mapping class="org.rhq.core.domain.configuration.PropertyMap" />
- <mapping class="org.rhq.core.domain.configuration.PropertySimple" />
- <mapping class="org.rhq.core.domain.configuration.ResourceConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.content.Architecture" />
- <mapping class="org.rhq.core.domain.content.Channel" />
- <mapping class="org.rhq.core.domain.content.ChannelContentSource" />
- <mapping class="org.rhq.core.domain.content.ChannelPackageVersion" />
- <mapping class="org.rhq.core.domain.content.ContentServiceRequest" />
- <mapping class="org.rhq.core.domain.content.ContentSource" />
- <mapping class="org.rhq.core.domain.content.ContentSourceSyncResults" />
- <mapping class="org.rhq.core.domain.content.ContentSourceType" />
- <mapping class="org.rhq.core.domain.content.InstalledPackage" />
- <mapping class="org.rhq.core.domain.content.InstalledPackageHistory" />
- <mapping class="org.rhq.core.domain.content.Package" />
- <mapping class="org.rhq.core.domain.content.PackageBits" />
- <mapping class="org.rhq.core.domain.content.PackageInstallationStep" />
- <mapping class="org.rhq.core.domain.content.PackageType" />
- <mapping class="org.rhq.core.domain.content.PackageVersion" />
- <mapping class="org.rhq.core.domain.content.PackageVersionContentSource" />
- <mapping class="org.rhq.core.domain.content.ProductVersionPackageVersion" />
- <mapping class="org.rhq.core.domain.content.ResourceChannel" />
- <mapping class="org.rhq.core.domain.event.Event" />
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+ <session-factory>
+ <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/rhq</property>
+ <property name="hibernate.connection.username">rhqadmin</property>
+ <property name="hibernate.connection.password">rhqadmin</property>
+ <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+ <property name="hibernate.default_schema">public</property>
+
+ <!--
+ <property name="hibernate.connection.url">jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</property>
+ <property name="hibernate.connection.username">***</property>
+ <property name="hibernate.connection.password">***</property>
+ <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
+ <property name="hibernate.dialect">org.hibernate.dialect.OracleDialect</property>
+ -->
+
+ <property name="hibernate.cache.use_second_level_cache">false</property>
+ <property name="hibernate.cache.use_query_cache">false</property>
+
+ <mapping class="org.rhq.core.domain.auth.Principal" />
+ <mapping class="org.rhq.core.domain.auth.Subject" />
+ <mapping class="org.rhq.core.domain.authz.Role" />
+ <mapping class="org.rhq.core.domain.common.SystemConfiguration" />
+ <mapping class="org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.configuration.Configuration" />
+ <mapping class="org.rhq.core.domain.configuration.PluginConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.configuration.Property" />
+ <mapping class="org.rhq.core.domain.configuration.PropertyList" />
+ <mapping class="org.rhq.core.domain.configuration.PropertyMap" />
+ <mapping class="org.rhq.core.domain.configuration.PropertySimple" />
+ <mapping class="org.rhq.core.domain.configuration.ResourceConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.content.Architecture" />
+ <mapping class="org.rhq.core.domain.content.Channel" />
+ <mapping class="org.rhq.core.domain.content.ChannelContentSource" />
+ <mapping class="org.rhq.core.domain.content.ChannelPackageVersion" />
+ <mapping class="org.rhq.core.domain.content.ContentServiceRequest" />
+ <mapping class="org.rhq.core.domain.content.ContentSource" />
+ <mapping class="org.rhq.core.domain.content.ContentSourceSyncResults" />
+ <mapping class="org.rhq.core.domain.content.ContentSourceType" />
+ <mapping class="org.rhq.core.domain.content.InstalledPackage" />
+ <mapping class="org.rhq.core.domain.content.InstalledPackageHistory" />
+ <mapping class="org.rhq.core.domain.content.Package" />
+ <mapping class="org.rhq.core.domain.content.PackageBits" />
+ <mapping class="org.rhq.core.domain.content.PackageInstallationStep" />
+ <mapping class="org.rhq.core.domain.content.PackageType" />
+ <mapping class="org.rhq.core.domain.content.PackageVersion" />
+ <mapping class="org.rhq.core.domain.content.PackageVersionContentSource" />
+ <mapping class="org.rhq.core.domain.content.ProductVersionPackageVersion" />
+ <mapping class="org.rhq.core.domain.content.ResourceChannel" />
+ <mapping class="org.rhq.core.domain.event.Event" />
<mapping class="org.rhq.core.domain.event.EventDefinition" />
- <mapping class="org.rhq.core.domain.event.EventSource" />
- <mapping class="org.rhq.core.domain.measurement.Availability" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementBaseline" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementData" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric1D" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric1H" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric6H" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementDataTrait" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementDefinition" />
- <mapping class="org.rhq.core.domain.measurement.MeasurementSchedule" />
- <mapping class="org.rhq.core.domain.operation.GroupOperationHistory" />
- <mapping class="org.rhq.core.domain.operation.GroupOperationScheduleEntity" />
- <mapping class="org.rhq.core.domain.operation.OperationDefinition" />
- <mapping class="org.rhq.core.domain.operation.OperationHistory" />
- <mapping class="org.rhq.core.domain.operation.OperationScheduleEntity" />
- <mapping class="org.rhq.core.domain.operation.ResourceOperationHistory" />
- <mapping class="org.rhq.core.domain.operation.ResourceOperationScheduleEntity" />
- <mapping class="org.rhq.core.domain.plugin.Plugin" />
- <mapping class="org.rhq.core.domain.resource.Agent" />
- <mapping class="org.rhq.core.domain.resource.CreateResourceHistory" />
- <mapping class="org.rhq.core.domain.resource.DeleteResourceHistory" />
- <mapping class="org.rhq.core.domain.resource.ProcessScan" />
- <mapping class="org.rhq.core.domain.resource.ProductVersion" />
- <mapping class="org.rhq.core.domain.resource.Resource" />
- <mapping class="org.rhq.core.domain.resource.ResourceError" />
- <mapping class="org.rhq.core.domain.resource.ResourceSubCategory" />
- <mapping class="org.rhq.core.domain.resource.ResourceType" />
- <mapping class="org.rhq.core.domain.configuration.definition.ConfigurationDefinition" />
- <mapping class="org.rhq.core.domain.configuration.definition.ConfigurationTemplate" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinition" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionEnumeration" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionList" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionMap" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple" />
- <mapping class="org.rhq.core.domain.configuration.definition.PropertyGroupDefinition" />
- <mapping class="org.rhq.core.domain.configuration.group.AbstractAggregateConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.configuration.group.AggregatePluginConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.configuration.group.AggregateResourceConfigurationUpdate" />
- <mapping class="org.rhq.core.domain.alert.Alert" />
- <mapping class="org.rhq.core.domain.alert.AlertCondition" />
- <mapping class="org.rhq.core.domain.alert.AlertConditionLog" />
- <mapping class="org.rhq.core.domain.alert.AlertDampeningEvent" />
- <mapping class="org.rhq.core.domain.alert.AlertDefinition" />
- <mapping class="org.rhq.core.domain.alert.notification.AlertNotification" />
- <mapping class="org.rhq.core.domain.alert.notification.AlertNotificationLog" />
- <mapping class="org.rhq.core.domain.alert.notification.EmailNotification" />
- <mapping class="org.rhq.core.domain.alert.notification.RoleNotification" />
- <mapping class="org.rhq.core.domain.alert.notification.SnmpNotification" />
- <mapping class="org.rhq.core.domain.alert.notification.SubjectNotification" />
- <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataKey" />
- <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataValue" />
- <mapping class="org.rhq.core.domain.measurement.oob.MeasurementOutOfBounds" />
- <mapping class="org.rhq.core.domain.resource.group.Group" />
- <mapping class="org.rhq.core.domain.resource.group.GroupDefinition" />
- <mapping class="org.rhq.core.domain.resource.group.ResourceGroup" />
- <mapping class="org.rhq.core.domain.configuration.definition.constraint.Constraint" />
- <mapping class="org.rhq.core.domain.configuration.definition.constraint.FloatRangeConstraint" />
- <mapping class="org.rhq.core.domain.configuration.definition.constraint.IntegerRangeConstraint" />
- <mapping class="org.rhq.core.domain.configuration.definition.constraint.RegexConstraint" />
-
- </session-factory>
-</hibernate-configuration>
\ No newline at end of file
+ <mapping class="org.rhq.core.domain.event.EventSource" />
+ <mapping class="org.rhq.core.domain.measurement.Availability" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementBaseline" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementData" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric1D" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric1H" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementDataNumeric6H" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementDataTrait" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementDefinition" />
+ <mapping class="org.rhq.core.domain.measurement.MeasurementSchedule" />
+ <mapping class="org.rhq.core.domain.operation.GroupOperationHistory" />
+ <mapping class="org.rhq.core.domain.operation.GroupOperationScheduleEntity" />
+ <mapping class="org.rhq.core.domain.operation.OperationDefinition" />
+ <mapping class="org.rhq.core.domain.operation.OperationHistory" />
+ <mapping class="org.rhq.core.domain.operation.OperationScheduleEntity" />
+ <mapping class="org.rhq.core.domain.operation.ResourceOperationHistory" />
+ <mapping class="org.rhq.core.domain.operation.ResourceOperationScheduleEntity" />
+ <mapping class="org.rhq.core.domain.plugin.Plugin" />
+ <mapping class="org.rhq.core.domain.resource.Agent" />
+ <mapping class="org.rhq.core.domain.resource.CreateResourceHistory" />
+ <mapping class="org.rhq.core.domain.resource.DeleteResourceHistory" />
+ <mapping class="org.rhq.core.domain.resource.ProcessScan" />
+ <mapping class="org.rhq.core.domain.resource.ProductVersion" />
+ <mapping class="org.rhq.core.domain.resource.Resource" />
+ <mapping class="org.rhq.core.domain.resource.ResourceError" />
+ <mapping class="org.rhq.core.domain.resource.ResourceSubCategory" />
+ <mapping class="org.rhq.core.domain.resource.ResourceType" />
+ <mapping class="org.rhq.core.domain.configuration.definition.ConfigurationDefinition" />
+ <mapping class="org.rhq.core.domain.configuration.definition.ConfigurationTemplate" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinition" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionEnumeration" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionList" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionMap" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple" />
+ <mapping class="org.rhq.core.domain.configuration.definition.PropertyGroupDefinition" />
+ <mapping class="org.rhq.core.domain.configuration.group.AbstractAggregateConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.configuration.group.AggregatePluginConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.configuration.group.AggregateResourceConfigurationUpdate" />
+ <mapping class="org.rhq.core.domain.alert.Alert" />
+ <mapping class="org.rhq.core.domain.alert.AlertCondition" />
+ <mapping class="org.rhq.core.domain.alert.AlertConditionLog" />
+ <mapping class="org.rhq.core.domain.alert.AlertDampeningEvent" />
+ <mapping class="org.rhq.core.domain.alert.AlertDefinition" />
+ <mapping class="org.rhq.core.domain.alert.notification.AlertNotification" />
+ <mapping class="org.rhq.core.domain.alert.notification.AlertNotificationLog" />
+ <mapping class="org.rhq.core.domain.alert.notification.EmailNotification" />
+ <mapping class="org.rhq.core.domain.alert.notification.RoleNotification" />
+ <mapping class="org.rhq.core.domain.alert.notification.SnmpNotification" />
+ <mapping class="org.rhq.core.domain.alert.notification.SubjectNotification" />
+ <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataKey" />
+ <mapping class="org.rhq.core.domain.measurement.calltime.CallTimeDataValue" />
+ <mapping class="org.rhq.core.domain.measurement.oob.MeasurementOutOfBounds" />
+ <mapping class="org.rhq.core.domain.resource.group.Group" />
+ <mapping class="org.rhq.core.domain.resource.group.GroupDefinition" />
+ <mapping class="org.rhq.core.domain.resource.group.ResourceGroup" />
+ <mapping class="org.rhq.core.domain.configuration.definition.constraint.Constraint" />
+ <mapping class="org.rhq.core.domain.configuration.definition.constraint.FloatRangeConstraint" />
+ <mapping class="org.rhq.core.domain.configuration.definition.constraint.IntegerRangeConstraint" />
+ <mapping class="org.rhq.core.domain.configuration.definition.constraint.RegexConstraint" />
+
+ </session-factory>
+</hibernate-configuration>