[rhq] 2 commits -
by ips
0 files changed
New commits:
commit 8588caefe8fa1034d9609935a639ed5513357dff
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 12:04:40 2010 -0400
bleh
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 071ac58..483e67f 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
- <version>3.0.1</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin descriptors</description>
commit 89c6fcb34e6bd29c95e7dca3c63af3ea8d4c435f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:39:41 2010 -0400
[maven-release-plugin] prepare release rhq-pluginAnnotations-3.0.1
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 483e67f..071ac58 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.1</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin descriptors</description>
13 years, 6 months
[rhq] 2 commits - modules/helpers
by ips
modules/helpers/pluginAnnotations/pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 7c1fb18c49da5a1dc9258c9e238096f85eead2e4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:39:03 2010 -0400
bleh
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 071ac58..483e67f 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
- <version>3.0.1</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin descriptors</description>
commit 3e11e975d0d521c314e72c361ff3a1d7698ebc51
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:36:45 2010 -0400
[maven-release-plugin] prepare release PluginAnnotations_3_0_1
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 3579caa..071ac58 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -15,7 +13,7 @@
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.1</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin descriptors</description>
13 years, 6 months
[rhq] modules/helpers
by ips
modules/helpers/pluginAnnotations/pom.xml | 26 +++++++++++++++-----------
modules/helpers/pluginGen/pom.xml | 25 ++++++++++++++-----------
modules/helpers/pom.xml | 19 ++++++++++++-------
3 files changed, 41 insertions(+), 29 deletions(-)
New commits:
commit 3754606f88c751ed44b1e1a326edb887d2fd2684
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:32:26 2010 -0400
break pluginGen and pluginAnnotations out from the RHQ reactor, so they can be released independently
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index e637aad..3579caa 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -1,29 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>rhq-helpers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0</version>
</parent>
-
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginAnnotations</artifactId>
<packaging>jar</packaging>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin annotations</name>
<description>Annotations to help generate plugin descriptors</description>
- <version>4.0.0-SNAPSHOT</version>
<scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</developerConnection>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginAnno...</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginAnno...</developerConnection>
</scm>
<build>
+
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -33,8 +36,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -46,8 +48,10 @@
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
+
+
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 221ae3e..25ddded 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>rhq-helpers</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0</version>
</parent>
-
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-pluginGen</artifactId>
<packaging>jar</packaging>
+ <version>3.0.1-SNAPSHOT</version>
<name>RHQ plugin generator</name>
<description>Helper to generate plugin skeletons</description>
- <version>4.0.0-SNAPSHOT</version>
<scm>
<connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers/pluginGen</connection>
@@ -25,6 +27,7 @@
<build>
<plugins>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -33,8 +36,7 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -64,7 +66,7 @@
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
- <goal>attached</goal> <!-- goals == mojos -->
+ <goal>single</goal> <!-- goals == mojos -->
</goals>
</execution>
</executions>
@@ -77,9 +79,8 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <version>1.1.0.jboss</version>
</dependency>
-
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -91,4 +92,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+
</project>
+
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a16c058..cb5d895 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -20,11 +22,13 @@
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/helpers</developerConnection>
</scm>
+
<properties>
<scm.module.path>modules/helpers/</scm.module.path>
</properties>
- <dependencies>
+
+ <dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
@@ -36,16 +40,17 @@
<modules>
- <!-- plugins that are used by both enterprise and embedded -->
- <module>rtfilter</module>
- <!-- plugin generator -->
+ <module>rtfilter</module>
+<!--
<module>pluginGen</module>
<module>pluginAnnotations</module>
- <module>bundleGen</module>
- <module>perftest-support</module>
+-->
+ <module>bundleGen</module>
+ <module>perftest-support</module>
</modules>
+
<profiles>
</profiles>
13 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/remoting/cli/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0c445716b27c75729209c0cff33826d1ce70c513
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 11:11:46 2010 -0400
use 'single' goal, rather than deprecated 'attached' goal, for assembly plugin execution
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 9811869..d418d82 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -208,7 +208,7 @@
<id>assemble-rhq-client-zip</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
13 years, 6 months
[rhq] Branch 'delete-agent-plugin' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.groovy | 32 +++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
New commits:
commit a33abb1372430d015a2d0d0957d42e3ad4ca2f91
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 1 10:39:16 2010 -0400
Adding test to verify that compatible groups are deleted
diff --git a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.groovy b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.groovy
index 421d28f..9b2f4c3 100644
--- a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.groovy
+++ b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.groovy
@@ -21,7 +21,8 @@ import org.rhq.core.domain.criteria.ResourceCriteria
import org.rhq.core.domain.resource.InventoryStatus
import org.testng.annotations.BeforeClass
import org.rhq.enterprise.server.bundle.TestBundleServerPluginService
-import org.rhq.core.domain.content.Package;
+import org.rhq.core.domain.content.Package
+import org.rhq.core.domain.resource.group.ResourceGroup;
class ResourceMetadataManagerBeanTest extends AbstractEJB3Test {
@@ -32,10 +33,12 @@ class ResourceMetadataManagerBeanTest extends AbstractEJB3Test {
def bundleService = new TestBundleServerPluginService();
prepareCustomServerPluginService(bundleService)
bundleService.startMasterPluginContainerWithoutSchedulingJobs()
+ prepareScheduler()
}
@AfterClass
void removePluginsFromDB() {
+ unprepareScheduler()
transaction {
// using direct hibernate query here because JPA 1.0 lacks support for the IN clause
// where you can directly specify a collection for the parameter value used in an IN
@@ -332,6 +335,7 @@ class ResourceMetadataManagerBeanTest extends AbstractEJB3Test {
createResources(3, 'RemoveTypesPlugin', 'ServerC')
createBundle("test-bundle-1", "Test Bundle", "ServerC", "RemoveTypesPlugin")
createPackage('ServerC::test-package', 'ServerC', 'RemoveTypesPlugin')
+ createResourceGroup('ServerC Group', 'ServerC', 'RemoveTypesPlugin')
def updatedDescriptor = """
<plugin name="RemoveTypesPlugin" displayName="Remove Types Plugin" package="org.rhq.plugins.test"
@@ -483,6 +487,16 @@ class ResourceMetadataManagerBeanTest extends AbstractEJB3Test {
assertEquals "All package types should have been deleted", 0, packageTypes.size()
}
+ @Test(dependsOnMethods = ['upgradePluginWithTypesRemoved'], groups = ['RemoveTypes'])
+ void deleteResourceGroups() {
+ def groups = entityManager.createQuery("from ResourceGroup g where g.name = :name and g.resourceType.name = :typeName")
+ .setParameter("name", "ServerC Group")
+ .setParameter("typeName", "ServerC")
+ .getResultList()
+
+ assertEquals "All resource groups should have been deleted", 0, groups.size()
+ }
+
/**
* This method creates the plugin-related artifacts that are need to call
* ResourceMetadataManager.registerPlugin. It creates the PluginDescriptor object, and
@@ -619,6 +633,22 @@ class ResourceMetadataManagerBeanTest extends AbstractEJB3Test {
contentMgr.persistPackage(pkg)
}
+ def createResourceGroup(groupName, resourceTypeName, pluginName) {
+ def subjectMgr = LookupUtil.subjectManager
+ def resourceTypeMgr = LookupUtil.resourceTypeManager
+ def resourceGroupMgr = LookupUtil.resourceGroupManager
+
+ def resourceType = resourceTypeMgr.getResourceTypeByNameAndPlugin(resourceTypeName, pluginName)
+
+ assertNotNull(
+ "Cannot create resource group. Unable to find resource type for [name: $resourceTypeName, plugin: $pluginName]",
+ resourceType
+ )
+
+ def resourceGroup = new ResourceGroup(groupName, resourceType)
+ resourceGroupMgr.createResourceGroup(subjectMgr.overlord, resourceGroup)
+ }
+
def transaction(work) {
try {
transactionManager.begin()
13 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8ee2538a958122aa6d409f62c147dd950c517985
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 1 08:59:52 2010 -0400
upgrade SmartGWT from 2.2 to 2.2.RHQ1 (a recent build from SmartGWT HEAD)
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 2b61393..58cdf8a 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -24,7 +24,7 @@
<properties>
<!-- dependency versions -->
<gwt.version>2.0.4</gwt.version>
- <smartgwt.version>2.2</smartgwt.version>
+ <smartgwt.version>2.2.RHQ1</smartgwt.version>
<!-- If this is too much memory to allocate to your gwt:debug process then override this property in
in your settings.xml -->
13 years, 6 months