modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 8 ++-- modules/plugins/netservices/pom.xml | 18 +++++++--- 2 files changed, 18 insertions(+), 8 deletions(-)
New commits: commit 37053500c05ec42b23740e4612899f2c56a21864 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Feb 25 11:27:51 2010 +0100
BZ 568275 - add commons-codec which is needed with commons-httpclient 3
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 58087fa..06ae2ae 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -33,6 +33,11 @@ <artifactId>commons-httpclient</artifactId> <version>3.0.1</version> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.2</version> + </dependency>
</dependencies> @@ -58,6 +63,11 @@ <artifactId>commons-httpclient</artifactId> <version>3.0.1</version> </artifactItem> + <artifactItem> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.2</version> + </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> </configuration> @@ -202,13 +212,13 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> - <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <tasks> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset><include name="META-INF/**" /></patternset> </unjar> - <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -216,7 +226,7 @@ <goal>run</goal> </goals> </execution> - + <execution> <id>undeploy</id> <phase>clean</phase>
commit b32fab5ccf90e3f6bc5c9c16e78daeb069f62675 Author: Heiko W. Rupp hwr@redhat.com Date: Thu Feb 25 10:59:56 2010 +0100
Persisting a new resource is no error ...
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 6755733..3af7a35 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -188,7 +188,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage }
entityManager.persist(resource); - log.error("********* resource persisted ************"); + log.debug("********* resource persisted ************"); // Execute sub-methods as overlord to bypass additional security checks. Subject overlord = this.subjectManager.getOverlord(); updateImplicitMembership(overlord, resource); @@ -366,7 +366,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0, PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_1, // first delete the config objects PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_2, // then the history objects wrapping those configs - AlertConditionLog.QUERY_DELETE_BY_RESOURCES, // Don't + AlertConditionLog.QUERY_DELETE_BY_RESOURCES, // Don't AlertNotificationLog.QUERY_DELETE_BY_RESOURCES, // alter Alert.QUERY_DELETE_BY_RESOURCES, // order AlertCondition.QUERY_DELETE_BY_RESOURCES, // of @@ -2134,7 +2134,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage parent = null; break; } - + } while (parent != null); if (resource != null) { if (!authorizationManager.canViewResource(subject, resource.getId())) { @@ -2164,7 +2164,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
public <T> ResourceNamesDisambiguationResult<T> disambiguate(List<T> results, boolean alwaysIncludeParent, IntExtractor<? super T> extractor) { - + if (results.isEmpty()) { return new ResourceNamesDisambiguationResult<T>(new ArrayList<DisambiguationReport<T>>(), false, false, false);