[rhq] 2 commits - .classpath modules/core modules/enterprise modules/plugins pom.xml
by Joseph Marques
.classpath | 2 +-
modules/core/dbutils/pom.xml | 4 ----
modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 2 --
modules/core/domain/pom.xml | 1 -
modules/enterprise/server/container/pom.xml | 3 ---
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 3 ---
modules/plugins/oracle/pom.xml | 4 ++--
pom.xml | 8 --------
8 files changed, 3 insertions(+), 24 deletions(-)
New commits:
commit ec8807ad7cf9b987f9c7356ed7b50136ef9f503d
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sun Jan 31 00:06:30 2010 -0500
eliminate references to old ojdbc14 library (ojdbc5 is used exclusively everywhere now)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index f644344..a0481b7 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -143,7 +143,6 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />-->
<property name="ojdbc5.version" value="${ojdbc5.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
@@ -175,7 +174,6 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />-->
<property name="ojdbc5.version" value="${ojdbc5.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
@@ -208,7 +206,6 @@
<property name="settings.localRepository" location="${user.home}/.m2/repository" />
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
- <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />-->
<property name="ojdbc5.version" value="${ojdbc5.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
@@ -248,7 +245,6 @@
</systemProperties>
<!-- The below is required for tests to run against Oracle. -->
<additionalClasspathElements>
- <!--<additionalClasspathElement>${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar</additionalClasspathElement>-->
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index 5fcc174..76d2c07 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -54,7 +54,6 @@ To run the default target, you must set one of the following properties to true:
unless="dbsetup-init-taskdefs.notrequired">
<path id="full.task.classpath">
<pathelement path="${task.classpath.property}" />
- <!--<pathelement location="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar"/>-->
<pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/>
<pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/>
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
@@ -306,7 +305,6 @@ To run the default target, you must set one of the following properties to true:
print="true"
showheaders="false">
<classpath>
- <!--<pathelement location="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar"/>-->
<pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/>
<pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/>
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 6bb8118..45241fe 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -231,7 +231,6 @@
</systemProperties>
<!-- The below is required for tests to run against Oracle. -->
<additionalClasspathElements>
- <!--<additionalClasspathElement>${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar</additionalClasspathElement>-->
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 41e0119..39c7122 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -170,7 +170,6 @@
<!-- dependency versions -->
<property name="rhq.version" value="${project.version}" />
<property name="jboss.version" value="${jboss.version}" />
- <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />-->
<property name="ojdbc5.version" value="${ojdbc5.version}" />
<property name="postgresql.version" value="${postgresql.version}" />
<property name="h2.version" value="${h2.version}" />
@@ -319,8 +318,6 @@
<fileset dir="${deployment.dir}/bin" includes="*.sh" />
<fileset dir="${deployment.dir}/jbossas/bin" includes="*.sh" />
</chmod>
- <!-- Delete old ojdbc14 jar(s). -->
- <delete verbose="true"><fileset dir="${deployment.dir}/jbossas/server/default/lib" includes="ojdbc14-*.jar" /></delete>
</tasks>
</configuration>
<goals>
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 cd6f94a..b9f4181 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
@@ -237,9 +237,6 @@
<property name="jboss.lib.dir" location="${jboss.home}/server/default/lib" />
<echo>Copying additional libs to ${jboss.lib.dir} ...</echo>
- <!--<copy file="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar"
- toDir="${jboss.lib.dir}" failonerror="false" verbose="true" />-->
- <delete verbose="true"><fileset dir="${jboss.lib.dir}" includes="ojdbc14-*.jar" /></delete>
<copy file="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"
toDir="${jboss.lib.dir}" failonerror="false" verbose="true" />
<copy file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 8b9a162..1acdb0f 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -62,8 +62,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>ojdbc14</groupId>
- <artifactId>ojdbc14</artifactId>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc5</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 2091740..b43da0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,6 @@
<jaxb-impl.version>2.1.6</jaxb-impl.version>
<jsf-api.version>1.2_14</jsf-api.version>
<jsf-impl.version>1.2_14</jsf-impl.version>
- <ojdbc14.version>10.2.0.4.0</ojdbc14.version>
<ojdbc5.version>11.2.0.1.0</ojdbc5.version>
<ems.version>1.2.11</ems.version>
<postgresql.version>8.4-701.jdbc3</postgresql.version>
@@ -728,13 +727,6 @@
The driver can not be packaged for OpenSource distributions due to licensing issues, and as such,
this profile should not be active by default. -->
<dependency>
- <groupId>ojdbc14</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>${ojdbc14.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc5</artifactId>
<version>${ojdbc5.version}</version>
commit b5db70e718b91679ca57d6a3b92f989add17ca15
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat Jan 30 23:57:46 2010 -0500
update .classpath to point to new generated WS classes
diff --git a/.classpath b/.classpath
index 43dfd4e..ae63f80 100644
--- a/.classpath
+++ b/.classpath
@@ -227,7 +227,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/>
- <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-1.4.0-SNAPSHOT/wsconsume-output"/>
+ <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-3.0.0-SNAPSHOT/wsconsume-output"/>
<classpathentry exported="true" kind="var" path="M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
13 years, 10 months
[rhq] Branch 'gwt' - scripts/ignore-target-dirs.js
by Joseph Marques
scripts/ignore-target-dirs.js | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
New commits:
commit 38599f649d2d29f66ddf1519a5510b8c7c1d6605
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat Jan 30 16:56:25 2010 -0500
add eclipse dash/monkey scripts to ignore target dirs and (default location for) dev-container
diff --git a/scripts/ignore-target-dirs.js b/scripts/ignore-target-dirs.js
new file mode 100644
index 0000000..97af1b7
--- /dev/null
+++ b/scripts/ignore-target-dirs.js
@@ -0,0 +1,20 @@
+/*
+ * Menu: RHQ > Make Maven Targets Derived
+ * DOM: http://download.eclipse.org/technology/dash/update/org.eclipse.eclipsemon...
+ */
+
+function main() {
+ var files = resources.filesMatching(".*/pom\\.xml");
+ var targetFolder;
+
+ for each( file in files ) {
+ if (targetFolder = file.eclipseObject.parent.findMember("target")) {
+ targetFolder.setDerived(true);
+ }
+ }
+
+ files = resources.filesMatching(".*/dev-container/jbossas/bin/run.sh");
+ for each( file in files ) {
+ file.eclipseObject.parent.parent.parent.setDerived(true);
+ }
+}
\ No newline at end of file
13 years, 10 months
[rhq] modules/enterprise modules/plugins
by jdob
modules/enterprise/server/ear/pom.xml | 2 --
modules/enterprise/server/plugins/pom.xml | 6 +++---
modules/plugins/pom.xml | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 8fe2633d82206dd8e54ce960d3f6a059cb71f3ca
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Sat Jan 30 11:09:53 2010 -0500
These were only supposed to be disabled in the release-3.0.0.B02 branch. I accidentally merged these into master, so undoing the changes.
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index e53b86c..3d05538 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -388,13 +388,11 @@
<version>${project.version}</version>
</artifactItem>
-<!--
<artifactItem>
<groupId>org.rhq</groupId>
<artifactId>rhq-kickstart-plugin</artifactId>
<version>${project.version}</version>
</artifactItem>
--->
</artifactItems>
<outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 8a38aaf..d9b612e 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -44,10 +44,10 @@
<module>alert-irc</module>
<module>alert-mobicents</module>
<module>alert-microblog</module>
-<!-- <module>alert-roles</module> -->
+ <module>alert-roles</module>
<module>alert-snmp</module>
-<!-- <module>alert-subject</module> -->
-<!-- <module>cobbler</module> -->
+ <module>alert-subject</module>
+ <module>cobbler</module>
<module>validate-all-serverplugins</module>
</modules>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index b287a49..a0d4924 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -122,7 +122,7 @@
<module>sshd</module>
<module>twitter</module>
<module>virt</module>
-<!-- <module>kickstart</module> -->
+ <module>kickstart</module>
<!-- this is just for testing raw config -->
<module>raw-config-test</module>
13 years, 10 months
[rhq] etc/apt etc/modules etc/samples modules/enterprise modules/jopr modules/plugins
by jdob
etc/apt/pom.xml | 2 +-
etc/modules/base-perspective-war/pom.xml | 4 ++--
etc/samples/custom-serverplugin/pom.xml | 2 +-
etc/samples/perspectives/sample-perspective/app/pom.xml | 2 +-
etc/samples/perspectives/sample-perspective/perspective/pom.xml | 4 ++--
etc/samples/perspectives/sample-perspective/pom.xml | 2 +-
etc/samples/simplereport-serverplugin/pom.xml | 2 +-
etc/samples/skeleton-plugin/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/scripts/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/license-gen/jar/pom.xml | 2 +-
modules/enterprise/server/license-gen/maven-plugin/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/pom.xml | 2 +-
modules/jopr/pom.xml | 4 ++--
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/hardware/pom.xml | 2 +-
modules/plugins/iptables/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 4 ++--
modules/plugins/jdbctrace/pom.xml | 2 +-
modules/plugins/jira/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/lsof/pom.xml | 2 +-
modules/plugins/onewire/pom.xml | 2 +-
modules/plugins/services/pom.xml | 2 +-
33 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 878bdc5d1bbf9f0ef78e94a27ec9982bf7866a50
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Sat Jan 30 11:04:29 2010 -0500
Updated version from 1.4.0-SNAPSHOT to 3.0.0-SNAPSHOT on files that were missed by maven.
diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml
index 47da3e5..a6f6552 100644
--- a/etc/apt/pom.xml
+++ b/etc/apt/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/etc/modules/base-perspective-war/pom.xml b/etc/modules/base-perspective-war/pom.xml
index db49b91..fa64c2f 100644
--- a/etc/modules/base-perspective-war/pom.xml
+++ b/etc/modules/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
@@ -30,7 +30,7 @@
<seam.version>2.1.0.SP1</seam.version>
<jboss-el.version>1.0_02.CR5</jboss-el.version>
<richfaces.version>3.3.2.SR1</richfaces.version>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
<dependencyManagement>
diff --git a/etc/samples/custom-serverplugin/pom.xml b/etc/samples/custom-serverplugin/pom.xml
index 833ce0c..0adccf6 100644
--- a/etc/samples/custom-serverplugin/pom.xml
+++ b/etc/samples/custom-serverplugin/pom.xml
@@ -15,7 +15,7 @@
<description>A template for building a custom generic RHQ server plugin</description>
<properties>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
<dependencies>
diff --git a/etc/samples/perspectives/sample-perspective/app/pom.xml b/etc/samples/perspectives/sample-perspective/app/pom.xml
index bc71b69..7b4c684 100644
--- a/etc/samples/perspectives/sample-perspective/app/pom.xml
+++ b/etc/samples/perspectives/sample-perspective/app/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/etc/samples/perspectives/sample-perspective/perspective/pom.xml b/etc/samples/perspectives/sample-perspective/perspective/pom.xml
index 85c0c43..8a9587a 100644
--- a/etc/samples/perspectives/sample-perspective/perspective/pom.xml
+++ b/etc/samples/perspectives/sample-perspective/perspective/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
@@ -21,7 +21,7 @@
<description>A Sample Perspective showing extension points and filters</description>
<properties>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
<dependencies>
diff --git a/etc/samples/perspectives/sample-perspective/pom.xml b/etc/samples/perspectives/sample-perspective/pom.xml
index 15a7d3b..b3800fe 100644
--- a/etc/samples/perspectives/sample-perspective/pom.xml
+++ b/etc/samples/perspectives/sample-perspective/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/etc/samples/simplereport-serverplugin/pom.xml b/etc/samples/simplereport-serverplugin/pom.xml
index 48c0f6c..15fcf0a 100644
--- a/etc/samples/simplereport-serverplugin/pom.xml
+++ b/etc/samples/simplereport-serverplugin/pom.xml
@@ -15,7 +15,7 @@
<description>A RHQ server plugin that periodically outputs a simple report containing some RHQ data</description>
<properties>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
<dependencies>
diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml
index 517ccf4..95fe7ab 100644
--- a/etc/samples/skeleton-plugin/pom.xml
+++ b/etc/samples/skeleton-plugin/pom.xml
@@ -15,7 +15,7 @@
<description>A template for building a custom RHQ agent plugin</description>
<properties>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
<dependencies>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index b4adfee..33966bd 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 25a3820..395a90f 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 63c7f6f..b2b2000 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/scripts/pom.xml b/modules/enterprise/remoting/scripts/pom.xml
index 77f416c..cbe2b82 100644
--- a/modules/enterprise/remoting/scripts/pom.xml
+++ b/modules/enterprise/remoting/scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-cli-scripts</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 833d0d4..366df51 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 4059073..cd58ba5 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 4ee342f..41e0119 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/license-gen/jar/pom.xml b/modules/enterprise/server/license-gen/jar/pom.xml
index 4509742..ca17646 100644
--- a/modules/enterprise/server/license-gen/jar/pom.xml
+++ b/modules/enterprise/server/license-gen/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/license-gen/maven-plugin/pom.xml b/modules/enterprise/server/license-gen/maven-plugin/pom.xml
index ef9261c..bf1c453 100644
--- a/modules/enterprise/server/license-gen/maven-plugin/pom.xml
+++ b/modules/enterprise/server/license-gen/maven-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 106738b..a8038d0 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml
index 651ef3e..0932415 100644
--- a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml
+++ b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 13b3b95..ec8ba7a 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 6244a23..03d11eb 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 8d1fbe0..3c03600 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/jopr/pom.xml b/modules/jopr/pom.xml
index a7a3a0a..d96100b 100644
--- a/modules/jopr/pom.xml
+++ b/modules/jopr/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
@@ -37,7 +37,7 @@
<properties>
<rhq.groupId>org.rhq</rhq.groupId>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version>
<rhq.product.name>RHQ</rhq.product.name>
<rhq.earName>rhq.ear</rhq.earName>
<!-- the below path is relative to {rhq-trunk} -->
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 044a682..4f185f4 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hardware/pom.xml b/modules/plugins/hardware/pom.xml
index cfd2c8c..43c582d 100644
--- a/modules/plugins/hardware/pom.xml
+++ b/modules/plugins/hardware/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml
index 8cb587c..d2b6ff6 100644
--- a/modules/plugins/iptables/pom.xml
+++ b/modules/plugins/iptables/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 2387c28..30dcae2 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -9,7 +9,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
@@ -21,7 +21,7 @@
<properties>
<scm.module.path>TODO</scm.module.path>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version> <!-- TODO adjust, see above too -->
+ <rhq.version>3.0.0-SNAPSHOT</rhq.version> <!-- TODO adjust, see above too -->
</properties>
<build>
diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml
index 6dbc2e5..b21740c 100644
--- a/modules/plugins/jdbctrace/pom.xml
+++ b/modules/plugins/jdbctrace/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml
index 40a62f7..ac4ec8d 100644
--- a/modules/plugins/jira/pom.xml
+++ b/modules/plugins/jira/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 793526f..a235ca5 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml
index 79bb3c5..c579da0 100644
--- a/modules/plugins/lsof/pom.xml
+++ b/modules/plugins/lsof/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml
index 2d43189..7bfced6 100644
--- a/modules/plugins/onewire/pom.xml
+++ b/modules/plugins/onewire/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml
index 1380cd6..3ef276d 100644
--- a/modules/plugins/services/pom.xml
+++ b/modules/plugins/services/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
13 years, 10 months
[rhq] Branch 'gwt' - modules/enterprise
by Joseph Marques
modules/enterprise/gui/coregui/pom.xml | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit ac6c82ae578d0190a51f3013c7057e2c1319716a
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat Jan 30 09:00:41 2010 -0500
since git can't version empty directories, remove "webapp-filtered" directory from maven-war-plugin configuration until content actually exists in it
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 7f80e7c..d4d5cc4 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -180,10 +180,6 @@
<filtering>false</filtering>
<directory>${basedir}/war</directory>
</resource>
- <resource>
- <filtering>true</filtering>
- <directory>${basedir}/src/main/webapp-filtered</directory>
- </resource>
</webResources>
</configuration>
</plugin>
13 years, 10 months
[rhq] Branch 'gwt' - .classpath
by Joseph Marques
.classpath | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bdfa975035d04d774647893058b191402481fabf
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat Jan 30 08:48:36 2010 -0500
export GWT user library
diff --git a/.classpath b/.classpath
index f681faa..22722d1 100644
--- a/.classpath
+++ b/.classpath
@@ -225,6 +225,6 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.0.0/gwt-user-2.0.0.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.0.0/gwt-user-2.0.0.jar"/>
<classpathentry kind="output" path="eclipse-classes"/>
</classpath>
13 years, 10 months
[rhq] Branch 'gwt' - .classpath
by Joseph Marques
.classpath | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 8974bf280f9fccf2bb259f9b099dda76a6afbd01
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat Jan 30 08:40:04 2010 -0500
fix .classpath so eclipse builds
diff --git a/.classpath b/.classpath
index 8b3c7cf..f681faa 100644
--- a/.classpath
+++ b/.classpath
@@ -225,5 +225,6 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/fedorahosted/cobbler/cobbler4j/0.1/cobbler4j-0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.0.0/gwt-user-2.0.0.jar"/>
<classpathentry kind="output" path="eclipse-classes"/>
</classpath>
13 years, 10 months
[rhq] Branch 'linux-config' - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java | 8 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 5 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java | 41 ++++------
3 files changed, 23 insertions(+), 31 deletions(-)
New commits:
commit 41074662511d03f3cbced4c631a2433b2583d6e1
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Jan 29 22:15:23 2010 -0500
Handle the fact that postgres parses the escape character like any other
string literal, treating \ like an escape character and therefore
forcing '\\' to indicate a backslash as the escape char.
Handle escaping of literal % and _ and \ in the LIKE pattern.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
index c7566b9..02d5c73 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java
@@ -165,8 +165,12 @@ public abstract class PostgresqlDatabaseType extends DatabaseType {
/**
* This is overridden for Postgres because by default (at least in our currently supported versions)
- * postgres does not treat the backslash as a string literal, which breaks the sql standard. See
- * http://opensource.atlassian.com/projects/hibernate/browse/HHH-2674 for more.
+ * postgres treats '\' as an escape character in a string literal and the ESCAPE character for
+ * LIKE syntax is specified as a string literal. Therefore, ESCAPE '\\' is required to
+ * specify that the escape character is in fact a single backslash.
+ * Note 1: The default behavior may change in a future version of postgres given that
+ * the standard_conforming_strings setting may change from 'off' to 'on' out of the box.
+ * Note 2: Also related, http://opensource.atlassian.com/projects/hibernate/browse/HHH-2674 for more.
*
* @see DatabaseType#getEscapeCharacter()
*/
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 41a5a8c..56602a5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -365,11 +365,6 @@ public final class CriteriaQueryGenerator {
if (wantCaseInsensitiveMatch) {
formattedValue = formattedValue.toLowerCase();
}
- /*
- * Double escape backslashes if they are not treated as string literals by the db vendor
- * http://opensource.atlassian.com/projects/hibernate/browse/HHH-2674
- */
- formattedValue = QueryUtility.handleDoubleEscaping(formattedValue);
if (wantsFuzzyMatching) {
// append '%' onto edges that don't already have '%' explicitly set from the caller
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java
index 7f91e4a..0c890c5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java
@@ -27,6 +27,8 @@ import org.rhq.core.db.DatabaseTypeFactory;
public class QueryUtility {
private static String ESCAPE_CHARACTER = null;
+ private static String ESCAPE_CLAUSE_CHARACTER = null;
+ private static String ESCAPED_ESCAPE = null;
private static String ESCAPED_PERCENT = null;
private static String ESCAPED_UNDERSCORE = null;
@@ -45,6 +47,7 @@ public class QueryUtility {
// Escape LIKE's wildcard characters with escaped characters so that the user's input
// will be matched literally
+ value = value.replace(ESCAPE_CHARACTER, ESCAPED_ESCAPE);
value = value.replace("_", ESCAPED_UNDERSCORE);
value = value.replace("%", ESCAPED_PERCENT);
@@ -75,44 +78,34 @@ public class QueryUtility {
public static String getEscapeClause() {
init();
- return " ESCAPE '" + ESCAPE_CHARACTER + "' ";
+ return " ESCAPE '" + ESCAPE_CLAUSE_CHARACTER + "' ";
}
/**
- * If the current DatabaseType requires double escaping then ensure it is set correctly. This may be useful
- * if the search string has been constructed outside of QueryUtil.formatSearchParameter(String).
- *
- * @param value single escaped search string value
- * @return The double escaped string
- */
- public static String handleDoubleEscaping(String value) {
- init();
-
- if ("\\\\".equals(ESCAPE_CHARACTER)) {
- value = value.replace("\\_", ESCAPED_UNDERSCORE);
- value = value.replace("\\%", ESCAPED_PERCENT);
- }
-
- return value;
- }
-
- /**
- * Get the proper escape character for the current DatabaseType.
+ * Get the proper ESCAPE clause character for the current DatabaseType.
*
* @return The escape character(s)
*/
public static String getEscapeCharacter() {
init();
- return ESCAPE_CHARACTER;
+ return ESCAPE_CLAUSE_CHARACTER;
}
private static void init() {
- if (null == ESCAPE_CHARACTER) {
- ESCAPE_CHARACTER = DatabaseTypeFactory.getDefaultDatabaseType().getEscapeCharacter();
+ if (null == ESCAPE_CLAUSE_CHARACTER) {
+ ESCAPE_CLAUSE_CHARACTER = DatabaseTypeFactory.getDefaultDatabaseType().getEscapeCharacter();
+
+ // The escape character should be a single character. In postgres and possibly other
+ // db types the character itself may need to be escaped for proper parsing of the ESCAPE value.
+ // (for example, ESCAPE '\\' in postgres because backslash in a string literal is
+ // escaped by default. In such a case assume the last character is the true escape character.
+ int len = ESCAPE_CLAUSE_CHARACTER.length();
+ ESCAPE_CHARACTER = (len > 1) ? ESCAPE_CLAUSE_CHARACTER.substring(len - 1) : ESCAPE_CLAUSE_CHARACTER;
+
+ ESCAPED_ESCAPE = ESCAPE_CHARACTER + ESCAPE_CHARACTER;
ESCAPED_UNDERSCORE = ESCAPE_CHARACTER + "_";
ESCAPED_PERCENT = ESCAPE_CHARACTER + "%";
}
}
-
}
13 years, 10 months
[rhq] Branch 'bundle' - modules/core modules/enterprise
by mazz
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 21 +++++++
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java | 24 ++++++++
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 22 +++++++
modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java | 28 ++++++++--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 24 ++++++++
7 files changed, 116 insertions(+), 7 deletions(-)
New commits:
commit 66475210ee515ebff6e856feb4199da91c9d82db
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Jan 29 19:35:12 2010 -0500
add new relationships to have bundle type associated with a resource type and a config def associated with a bundle version
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 1053bb4..28d6925 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -22,7 +22,7 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.77.2</db.schema.version>
+ <db.schema.version>2.78</db.schema.version>
</properties>
<dependencies>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
index d1ae3ad..5ec58f1 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
@@ -491,6 +491,7 @@
<table name="RHQ_BUNDLE_TYPE">
<column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
<column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
</table>
<!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
@@ -506,6 +507,7 @@
<column name="NAME" size="200" type="VARCHAR2" required="true"/>
<column name="VERSION" size="500" type="VARCHAR2" required="true"/>
<column name="ACTION" type="CLOB" required="true"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
<column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
<column name="DISTRIBUTION_ID" type="INTEGER" required="false" references="RHQ_DISTRIBUTION"/>
</table>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index dd16274..45efd6d 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3014,6 +3014,27 @@
<schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="snmp_oid"/>
<schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="email_address"/>
</schemaSpec>
+
+ <schemaSpec version="2.78">
+ <schema-addColumn table="RHQ_BUNDLE_VERSION" column="CONFIG_DEF_ID" columnType="INTEGER" />
+ <schema-directSQL>
+ <statement desc="Creating RHQ_BUNDLE_VERSION foreign key relation to RHQ_CONFIG_DEF">
+ ALTER TABLE RHQ_BUNDLE_VERSION
+ ADD CONSTRAINT RHQ_CONFIG_DEF_ID_FK
+ FOREIGN KEY (CONFIG_DEF_ID)
+ REFERENCES RHQ_CONFIG_DEF (ID)
+ </statement>
+ </schema-directSQL>
+ <schema-addColumn table="RHQ_BUNDLE_TYPE" column="RESOURCE_TYPE_ID" columnType="INTEGER" />
+ <schema-directSQL>
+ <statement desc="Creating RHQ_BUNDLE_TYPE foreign key relation to RHQ_RESOURCE_TYPE">
+ ALTER TABLE RHQ_BUNDLE_TYPE
+ ADD CONSTRAINT RHQ_RESOURCE_TYPE_ID_FK
+ FOREIGN KEY (RESOURCE_TYPE_ID)
+ REFERENCES RHQ_RESOURCE_TYPE (ID)
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
</dbupgrade>
</target>
</project>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java
index 6433df4..7de269c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java
@@ -29,6 +29,8 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.SequenceGenerator;
@@ -36,6 +38,8 @@ import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import org.rhq.core.domain.resource.ResourceType;
+
/**
* Defines a type of bundle that can exist in the system. Bundle types are used to determine
* how a bundle is to be processed.
@@ -63,12 +67,17 @@ public class BundleType implements Serializable {
@Column(name = "NAME", nullable = false)
private String name;
+ @JoinColumn(name = "RESOURCE_TYPE_ID", referencedColumnName = "ID", nullable = false)
+ @ManyToOne
+ private ResourceType resourceType;
+
public BundleType() {
// for JPA use
}
- public BundleType(String name) {
+ public BundleType(String name, ResourceType resourceType) {
setName(name);
+ setResourceType(resourceType);
}
public int getId() {
@@ -87,6 +96,19 @@ public class BundleType implements Serializable {
this.name = name;
}
+ /**
+ * Returns the resource type that is responsible for deploying and managing bundles of this bundle type.
+ *
+ * @return resource type that supports this bundle type
+ */
+ public ResourceType getResourceType() {
+ return resourceType;
+ }
+
+ public void setResourceType(ResourceType resourceType) {
+ this.resourceType = resourceType;
+ }
+
@Override
public String toString() {
return "BundleType[id=" + id + ",name=" + name + "]";
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
index f2ea97c..7a488dd 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java
@@ -24,6 +24,7 @@ package org.rhq.core.domain.bundle;
import java.io.Serializable;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -39,6 +40,7 @@ import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.content.Distribution;
/**
@@ -82,6 +84,10 @@ public class BundleVersion implements Serializable {
@ManyToOne(fetch = FetchType.LAZY)
private Distribution distribution;
+ @JoinColumn(name = "CONFIG_DEF_ID", referencedColumnName = "ID", nullable = true)
+ @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ private ConfigurationDefinition configurationDefinition;
+
public BundleVersion() {
// for JPA use
}
@@ -140,6 +146,22 @@ public class BundleVersion implements Serializable {
this.distribution = distribution;
}
+ /**
+ * Returns the metadata that describes the configuration that must be set in order for this
+ * bundle to be properly deployed. Think of this as "the questions that the user must answer"
+ * in order to provide values that are needed to deploy the content. This definition
+ * describes the {@link BundleConfig#getConfiguration() bundle config data}.
+ *
+ * @return defines the values that must be set in order for this bundle to be deployed properly
+ */
+ public ConfigurationDefinition getConfigurationDefinition() {
+ return configurationDefinition;
+ }
+
+ public void setConfigurationDefinition(ConfigurationDefinition configurationDefinition) {
+ this.configurationDefinition = configurationDefinition;
+ }
+
@Override
public String toString() {
return "BundleVersion[id=" + id + ",name=" + name + ",version=" + version + ",bundle=" + bundle + "]";
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
index 0ac6459..28a7162 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java
@@ -37,6 +37,8 @@ import org.rhq.core.domain.bundle.BundleVersionRepoPK;
import org.rhq.core.domain.content.Distribution;
import org.rhq.core.domain.content.DistributionType;
import org.rhq.core.domain.content.Repo;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.test.AbstractEJB3Test;
@Test
@@ -63,7 +65,7 @@ public class BundleTest extends AbstractEJB3Test {
q.setParameter("id", repo2.getId());
assert q.getResultList().size() == 0 : "should not have repo2 mapping in the db yet";
- BundleType bundleType = new BundleType(name + "-Type");
+ BundleType bundleType = new BundleType(name + "-Type", createResourceType(em));
Bundle bundle = new Bundle(name + "-Bundle", bundleType);
em.persist(bundle);
BundleVersion bundleVersion = new BundleVersion(name, "1.0.0.BETA", bundle);
@@ -127,7 +129,7 @@ public class BundleTest extends AbstractEJB3Test {
String name = "BundleTest-testBundleVersion";
String action = "action/script/recipe is here";
- BundleType bundleType = new BundleType(name + "-Type");
+ BundleType bundleType = new BundleType(name + "-Type", createResourceType(em));
Bundle bundle = new Bundle(name + "-Bundle", bundleType);
em.persist(bundle);
id = bundle.getId();
@@ -203,6 +205,8 @@ public class BundleTest extends AbstractEJB3Test {
em.remove(bundleType);
assert q.getResultList().size() == 0 : "didn't clean up test bundle";
assert em.find(BundleType.class, bundleType.getId()) == null : "didn't clean up bundle type";
+
+ deleteResourceType(em, bundleType.getResourceType());
em.close();
getTransactionManager().commit();
@@ -226,7 +230,7 @@ public class BundleTest extends AbstractEJB3Test {
String name = "BundleTest-testBundle";
- BundleType bundleType = new BundleType(name + "-Type");
+ BundleType bundleType = new BundleType(name + "-Type", createResourceType(em));
Bundle b = new Bundle(name, bundleType);
Query q = em.createNamedQuery(Bundle.QUERY_FIND_BY_NAME);
@@ -274,6 +278,8 @@ public class BundleTest extends AbstractEJB3Test {
BundleType bt = (BundleType) q.getSingleResult();
em.remove(bt);
assert q.getResultList().size() == 0 : "didn't clean up test bundle type";
+
+ deleteResourceType(em, bundleType.getResourceType());
em.close();
getTransactionManager().commit();
@@ -297,7 +303,7 @@ public class BundleTest extends AbstractEJB3Test {
String name = "BundleTest-testBundleType";
- BundleType bt = new BundleType(name);
+ BundleType bt = new BundleType(name, createResourceType(em));
Query q = em.createNamedQuery(BundleType.QUERY_FIND_BY_NAME);
q.setParameter("name", bt.getName());
@@ -330,6 +336,8 @@ public class BundleTest extends AbstractEJB3Test {
doomed = em.getReference(BundleType.class, doomed.getId());
em.remove(doomed);
assert q.getResultList().size() == 0 : "didn't remove the entity";
+
+ deleteResourceType(em, bt.getResourceType());
em.close();
getTransactionManager().commit();
done = true;
@@ -342,4 +350,16 @@ public class BundleTest extends AbstractEJB3Test {
}
}
}
+
+ private ResourceType createResourceType(EntityManager em) {
+ ResourceType rt = new ResourceType("BundleTest", "BundleTestPlugin", ResourceCategory.PLATFORM, null);
+ em.persist(rt);
+ return rt;
+ }
+
+ private ResourceType deleteResourceType(EntityManager em, ResourceType rt) {
+ rt = em.find(ResourceType.class, rt.getId());
+ em.remove(rt);
+ return rt;
+ }
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
index 90888f1..a6e3776 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.Query;
+import javax.transaction.TransactionManager;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -33,6 +34,8 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.bundle.Bundle;
import org.rhq.core.domain.bundle.BundleType;
import org.rhq.core.domain.bundle.BundleVersion;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -82,6 +85,12 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
em.remove(em.getReference(BundleType.class, ((BundleType) removeMe).getId()));
}
+ q = em.createQuery("SELECT rt FROM ResourceType rt WHERE rt.name LIKE '" + TEST_PREFIX + "%'");
+ doomed = q.getResultList();
+ for (Object removeMe : doomed) {
+ em.remove(em.getReference(ResourceType.class, ((ResourceType) removeMe).getId()));
+ }
+
getTransactionManager().commit();
em.close();
em = null;
@@ -129,13 +138,26 @@ public class BundleManagerBeanTest extends AbstractEJB3Test {
private BundleType createBundleType(String name) throws Exception {
final String fullName = TEST_PREFIX + "-type-" + name;
- BundleType bt = new BundleType(fullName);
+ BundleType bt = new BundleType(fullName, createResourceType(name));
bt = bundleManagerBean.createBundleType(bt);
assert bt.getId() > 0;
assert bt.getName().endsWith(fullName);
return bt;
}
+ private ResourceType createResourceType(String name) throws Exception {
+ final String fullName = TEST_PREFIX + "-resourcetype-" + name;
+ ResourceType rt = new ResourceType(fullName, "BundleManagerBeanTest", ResourceCategory.PLATFORM, null);
+
+ TransactionManager txMgr = getTransactionManager();
+ txMgr.begin();
+ EntityManager em = getEntityManager();
+ em.persist(rt);
+ em.close();
+ txMgr.commit();
+ return rt;
+ }
+
private Subject getOverlord() {
return LookupUtil.getSubjectManager().getOverlord();
}
13 years, 10 months