etc/standalone-pc/README.txt | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 46
++++++++++
modules/helpers/pluginGen/pom.xml | 34
+++----
4 files changed, 67 insertions(+), 17 deletions(-)
New commits:
commit 87cd5d6874732b0c6b487a4f4686d072acfccd74
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 7 13:56:45 2011 +0100
Allow to detect postgres 9.1
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
index ef66a51..d3f4035 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
@@ -146,6 +146,8 @@ public class DatabaseTypeFactory {
if (db_name.indexOf("postgresql") != -1) {
if (db_version.startsWith("7.")) {
database_type_class = Postgresql7DatabaseType.class;
+ } else if (db_version.startsWith("9.1")) {
+ database_type_class = Postgresql91DatabaseType.class;
} else if (db_version.startsWith("9.0")) {
database_type_class = Postgresql90DatabaseType.class;
} else if (db_version.startsWith("8.4")) {
diff --git
a/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
b/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
new file mode 100644
index 0000000..d4f97cc
--- /dev/null
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.db;
+
+/**
+ * Postgres 9.1 database which extends the Postgres 8.4 database.
+ * It is important to extend 8.3+ and not any previous version as the
+ * code will enable async commit in some place for instanceof 8.3
+ *
+ * Postgres 9.1 brings WAL-less tables.
+ *
+ * @author Heiko W. Rupp
+ */
+public class Postgresql91DatabaseType extends Postgresql90DatabaseType {
+ /**
+ * @see org.rhq.core.db.DatabaseType#getName()
+ */
+ @Override
+ public String getName() {
+ return PostgresqlDatabaseType.VENDOR_NAME + "9.1";
+ }
+
+ /**
+ * @see org.rhq.core.db.DatabaseType#getVersion()
+ */
+ @Override
+ public String getVersion() {
+ return "9.1";
+ }
+}
\ No newline at end of file
commit a84e8d9ed281349679f01cc30a9ec4d9f906bcbd
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 7 11:51:03 2011 +0100
Adjust version of the dependency.
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 462e550..fd6a367 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -36,7 +36,7 @@
</configuration>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -96,10 +96,10 @@
<dependency>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>cobertura</id>
@@ -114,22 +114,22 @@
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
- <version>1.9.4.1</version>
+ <version>1.9.4.1</version>
</dependency>
</dependencies>
- <executions>
- <execution>
+ <executions>
+ <execution>
<id>cobertura-instrument</id>
<phase>pre-integration-test</phase>
- <configuration>
- <tasks>
+ <configuration>
+ <tasks>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura" />
<mkdir dir="target/cobertura/backup"/>
<!-- backup all classes so that we can instrument the original
classes-->
<copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
<fileset dir="target/classes">
- <include name="**/*.class" />
+ <include name="**/*.class" />
</fileset>
</copy>
<!-- create a properties file and save there location of cobertura
data file-->
@@ -138,7 +138,7 @@
<taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
<include name="**/*.class"/>
</fileset>
</cobertura-instrument>
@@ -147,7 +147,7 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
+ </execution>
<execution>
<id>cobertura-report</id>
<phase>post-integration-test</phase>
@@ -160,7 +160,7 @@
<!-- restore classes from backup folder to classes folder -->
<copy toDir="target/classes" verbose="true"
overwrite="true">
<fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
+ <include name="**/*.class" />
</fileset>
</copy>
<!-- delete backup folder-->
@@ -178,12 +178,12 @@
<goals>
<goal>run</goal>
</goals>
- </execution>
- </executions>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
</project>
commit ac7d23865ef06f7a46466f2ab80d41aac496d9f9
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Feb 7 09:52:27 2011 +0100
Add a link to the video
diff --git a/etc/standalone-pc/README.txt b/etc/standalone-pc/README.txt
index fe6f07e..b940187 100644
--- a/etc/standalone-pc/README.txt
+++ b/etc/standalone-pc/README.txt
@@ -26,3 +26,5 @@ file is expected to contain a set of commands that are used as input (
"script m
It is possible to start a line with a hash mark (#) which means that this is a comment
line.
+Also have a look at a video that shows how to use the standalone container:
+http://vimeo.com/18624567
Show replies by date