modules/core/dbutils/pom.xml | 18 +++++----- modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 2 - 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit e768de5690175aeda7100bec48a219b532862725 Author: John Sanda jsanda@redhat.com Date: Sat May 4 21:41:50 2013 -0400
make sure default super user is used to create schema and fix deps
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 703950a..3a9ffca 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -193,17 +193,17 @@ <name>!jon.release</name> </property> </activation> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>rhq-cassandra-schema</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <build> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-cassandra-schema</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>i18n-generator</id> @@ -268,8 +268,8 @@ <property name="rhq.dev.cassandra.username" value="cassandra" /> <property name="rhq.dev.cassandra.password" value="cassandra" /> <property name="rhq.dev.cassandra.seeds" value="127.0.0.1|9160|9142" /> - <java classname="org.rhq.cassandra.schema.SchemaManager"> - <classpath refid="maven.compile.classpath" /> + <java classname="org.rhq.cassandra.schema.SchemaManager" failonerror="true"> + <classpath refid="maven.plugin.classpath"/> <arg value="resetSchema" /> <arg value="${rhq.dev.cassandra.username}" /> <arg value="${rhq.dev.cassandra.password}" /> diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index a48bd05..bbb31f3 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -1233,7 +1233,7 @@ public class InstallerServiceImpl implements InstallerService { String username = serverProps.get("rhq.cassandra.username"); String password = serverProps.get("rhq.cassandra.password");
- return new SchemaManager(username, password, hosts); + return new SchemaManager("cassandra", "cassandra", hosts); }
private void writeInstalledFileMarker() throws Exception {
rhq-commits@lists.fedorahosted.org