[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise

mazz mazz at fedoraproject.org
Wed Aug 22 13:51:24 UTC 2012


 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml |    4 ----
 modules/enterprise/server/ear/pom.xml                          |    6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1b30d7b2155f4ece6aecd291e1d00efdb5f97e32
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 21 17:38:15 2012 -0400

    another thing that should have been removed but was not

diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index 7983d61..794a88a 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -369,10 +369,6 @@
         <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI PlatformUtilizationGWTService</servlet-name>
         <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/PlatformUtilizationGWTService</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ReportExporter</servlet-name>
-        <url-pattern>/ReportExporter</url-pattern>
-    </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>Resteasy</servlet-name>


commit 059c1dde01f2783d841da1d3250a199789cefde7
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 21 17:16:42 2012 -0400

    do not deploy the "client" because it has everything in it - including the RHQApplication which AS7 doesn't like (because the ejb-jar already deploys it)

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index ae8d25e..d3d88ac 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -270,6 +270,12 @@
                             <bundleFileName>rhq-enterprise-server-ejb3.jar</bundleFileName>
                         </ejbModule>
 
+                        <ejbClientModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-enterprise-server</artifactId>
+                            <excluded>true</excluded>
+                        </ejbClientModule>
+
                         <ejbModule>
                             <groupId>${project.groupId}</groupId>
                             <artifactId>rhq-core-domain</artifactId>




More information about the rhq-commits mailing list