modules/core/client-api/pom.xml
| 19 ++++++++++
modules/enterprise/gui/coregui/pom.xml
| 19 ++++++++++
modules/enterprise/server/jar/pom.xml
| 12 ++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
| 4 +-
modules/enterprise/server/xml-schemas/pom.xml
| 19 ++++++++++
modules/plugins/perftest/pom.xml
| 19 ++++++++++
6 files changed, 90 insertions(+), 2 deletions(-)
New commits:
commit c7e3556170eb697243dad8ea24dc891e646b99f5
Merge: a889e82 2dc5e65
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jun 26 15:14:03 2012 -0400
Merge remote-tracking branch 'origin/master' into bug/783603
commit 2dc5e65abef4476d0b2a6247d258488688232888
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Jun 26 18:02:25 2012 +0200
[BZ 835574 - When setting up workspace, the dynamically generated classes are not
added to classpath] Solved using the org.codehaus.mojo:build-helper-maven-plugin. It adds
the generated sources. NOTE: the mvn "process-resources" should be checked in
the IDE Maven settings
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index b5f049f..834ad85 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -120,6 +120,25 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/gui/coregui/pom.xml
b/modules/enterprise/gui/coregui/pom.xml
index aac9b9c..29662c8 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -345,6 +345,25 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-gwt-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/target/generated-sources/gwt</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!--
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index 2ad20a2..bf10fc1 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -775,6 +775,18 @@ Build-OS-Version=${os.version}
</sources>
</configuration>
</execution>
+ <execution>
+ <id>add-antlr-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/target/generated-sources/antlr3</source>
+ </sources>
+ </configuration>
+ </execution>
</executions>
</plugin>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml
b/modules/enterprise/server/xml-schemas/pom.xml
index d14f05d..6923a7a 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -129,6 +129,25 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 739505b..e045081 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -77,6 +77,25 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
commit 9ee338547c8d09cb716b6982c74a11d22af212ec
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 26 11:04:45 2012 -0400
Provide more verbose Exception information in DEBUG mode.
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 f7ae643..dce2e23 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
@@ -380,8 +380,8 @@ public class ResourceManagerBean implements ResourceManagerLocal,
ResourceManage
// The most likely reason for a failure, although unlikely in itself, is
that newly discovered resources
// are currently being merged into the platform, and associated with the
doomed agent. In this case
// the user must wait until the merge is complete. Make sure the caller
knows about this possibility.
- throw new IllegalStateException(
- "Failed to uninventory platform. This can happen if new
resources were actively being imported. Please wait and try again shortly.");
+ String msg = "Failed to uninventory platform. This can happen if new
resources were actively being imported. Please wait and try again shortly.";
+ throw new IllegalStateException(msg, (log.isDebugEnabled() ? e : null));
}
throw e;
Show replies by date