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

mazz mazz at fedoraproject.org
Wed Aug 8 22:25:36 UTC 2012


 modules/enterprise/server/ear/pom.xml                                                     | 1624 ++++------
 modules/enterprise/server/ear/src/main/application/META-INF/README.txt                    |    2 
 modules/enterprise/server/ear/src/main/application/META-INF/jboss-app.xml                 |   29 
 modules/enterprise/server/ear/src/main/resources/custom-jaas-deployment-service.xml       |   12 
 modules/enterprise/server/ear/src/main/resources/mq-service.xml                           |   34 
 modules/enterprise/server/ear/src/main/resources/product-plugin-service.xml               |   13 
 modules/enterprise/server/ear/src/main/resources/quartz-scheduler-service.xml             |   39 
 modules/enterprise/server/ear/src/main/resources/server-comm-service.xml                  |  183 -
 modules/enterprise/server/ear/src/main/resources/server-service.xml                       |   17 
 modules/enterprise/server/sars/pom.xml                                                    |    1 
 modules/enterprise/server/sars/services-sar/pom.xml                                       |  123 
 modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml |  242 +
 12 files changed, 1167 insertions(+), 1152 deletions(-)

New commits:
commit 0380decba9ebe71626f738bbc5cc8b199b1272d2
Author: John Mazzitelli <mazz at redhat.com>
Date:   Wed Aug 8 18:25:31 2012 -0400

    move all services that used to be deployed at .xml files to SARs embedded in the EAR
    this doesn't work yet and need to figure out what to do with mdb service

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 4c42453..d3669c5 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -1,924 +1,898 @@
 <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>
-
-   <parent>
-      <groupId>org.rhq</groupId>
-      <artifactId>rhq-parent</artifactId>
-      <version>4.5.0-SNAPSHOT</version>
-      <relativePath>../../../../pom.xml</relativePath>
-   </parent>
-
-   <artifactId>rhq-enterprise-server-ear</artifactId>
-   <packaging>ear</packaging>
-
-   <name>RHQ Enterprise Server EAR</name>
-   <description>RHQ enterprise server EAR</description>
-
-   <properties>
-      <earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory>
-
-      <!-- dependency versions -->
-      <seam.version>1.2.1.GA</seam.version>
-   </properties>
-
-   <dependencies>
-
-      <!-- Internal Deps -->
-
-      <!-- ** EJB-JARs -->
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
-         <type>ejb</type>
-      </dependency>
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-core-domain</artifactId>
-         <version>${project.version}</version>
-         <type>ejb</type>
-      </dependency>
-
-      <!-- ** WARs -->
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-portal</artifactId>
-         <version>${project.version}</version>
-         <type>war</type>
-      </dependency>
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-coregui</artifactId>
-         <version>${project.version}</version>
-         <type>war</type>
-      </dependency>
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-content_http</artifactId>
-         <version>${project.version}</version>
-         <type>war</type>
-      </dependency>
-
-       <dependency>
-          <groupId>org.rhq</groupId>
-          <artifactId>rhq-rest</artifactId>
-          <version>${project.version}</version>
-          <type>war</type>
-       </dependency>
-
-      <!-- ** SARs -->
-      <!--
-         <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-agent-sar</artifactId>
-         <version>${project.version}</version> <type>sar</type> </dependency>
-      -->
-
-      <!-- ** JARs -->
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-script-bindings</artifactId>
-         <version>${project.version}</version>
-         <exclusions>
-           <exclusion>
-             <groupId>org.rhq</groupId>
-             <artifactId>rhq-core-domain</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>javassist</groupId>
-             <artifactId>javassist</artifactId>
-           </exclusion>
-         </exclusions>
-      </dependency>
-
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-scripting-javascript</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.rhq</groupId>
-        <artifactId>rhq-server-client-api</artifactId>
-        <version>${project.version}</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.rhq</groupId>
-                   <artifactId>rhq-container-lib</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>org.rhq</groupId>
-                   <artifactId>rhq-enterprise-server</artifactId>
-               </exclusion>
-           </exclusions>        
-      </dependency>
-
-      <!-- 3rd Party Deps -->
-
-      <!-- ** WARs -->
-
-      <dependency>
-         <groupId>jboss</groupId>
-         <artifactId>jboss-remoting-servlet-invoker</artifactId>
-         <version>2x.r3040.jon</version>
-         <type>war</type>
-      </dependency>
-
-      <!-- ** JARs -->
-
-      <dependency>
-        <groupId>postgresql</groupId>
-        <artifactId>postgresql</artifactId>
-        <version>${postgresql.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <!--
-         <dependency> <groupId>jboss</groupId> <artifactId>jboss-seam</artifactId> <version>${seam.version}</version>
-         </dependency>
-      -->
-
-       <dependency>
-           <groupId>org.jboss.resteasy</groupId>
-           <artifactId>resteasy-jaxrs</artifactId>
-           <version>${resteasy.version}</version>
-           <scope>jar</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.httpcomponents</groupId>
-                   <artifactId>httpclient</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>org.apache.httpcomponents</groupId>
-                   <artifactId>httpcore</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>javassist</groupId>
-                   <artifactId>javassist</artifactId>
-               </exclusion>
-           </exclusions>
-       </dependency>
-       <dependency>
-           <groupId>org.jboss.resteasy</groupId>
-           <artifactId>resteasy-jackson-provider</artifactId>
-           <version>${resteasy.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.jboss.resteasy</groupId>
-           <artifactId>resteasy-links</artifactId>
-           <version>${resteasy.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.freemarker</groupId>
-           <artifactId>freemarker</artifactId>
-           <version>${freemarker.version}</version>
-           <type>jar</type>
-       </dependency>
-       <dependency>
-             <groupId>org.jboss.resteasy</groupId>
-             <artifactId>resteasy-yaml-provider</artifactId>
-             <version>${resteasy.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.yaml</groupId>
-           <artifactId>snakeyaml</artifactId>
-           <version>1.8</version>
-       </dependency>
-       <dependency>
-           <groupId>org.jboss.resteasy</groupId>
-           <artifactId>resteasy-jaxb-provider</artifactId>
-           <version>${resteasy.version}</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>com.sun.xml.bind</groupId>
-                   <artifactId>jaxb-impl</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>com.sun.xml.stream</groupId>
-                   <artifactId>sjsxp</artifactId>
-               </exclusion>
-           </exclusions>
-       </dependency>
-
-
-   </dependencies>
-
-   <build>
-
-      <finalName>rhq</finalName>
-
-      <resources>
-
-         <resource>
-            <directory>src/main/resources</directory>
-            <filtering>true</filtering>
-         </resource>
-
-      </resources>
-
-      <plugins>
-
-         <plugin>
-            <artifactId>maven-ear-plugin</artifactId>
-            <configuration>
-               <displayName>RHQ</displayName>
-               <workDirectory>${earDirectory}</workDirectory>
-               <resourcesDir>${basedir}/target/classes</resourcesDir>
-               <defaultJavaBundleDir>lib</defaultJavaBundleDir>
-               <unpackTypes>war,ejb,sar</unpackTypes>
-
-               <modules>
-
-                  <!-- ** WARs -->
-
-                  <webModule>
-                     <groupId>org.rhq</groupId>
-                     <artifactId>rhq-coregui</artifactId>
-                     <bundleFileName>coregui.war</bundleFileName>
-                     <contextRoot>/coregui</contextRoot>
-                  </webModule>
-
-                  <webModule>
-                     <groupId>${project.groupId}</groupId>
-                     <artifactId>rhq-portal</artifactId>
-                     <bundleFileName>rhq-portal.war</bundleFileName>
-                     <contextRoot>/</contextRoot>
-                  </webModule>
-
-                  <!--  used to expose content through http -->
-                  <webModule>
-                     <groupId>${project.groupId}</groupId>
-                     <artifactId>rhq-content_http</artifactId>
-                     <excluded>${exclude-content_http}</excluded>
-                     <bundleFileName>rhq-content_http.war</bundleFileName>
-                     <contextRoot>/content</contextRoot>
-                  </webModule>
-
-                   <webModule>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>rhq-rest</artifactId>
-                      <bundleFileName>rhq-rest.war</bundleFileName>
-                      <contextRoot>/rest</contextRoot>
-                   </webModule>
-                  <!-- ** EJB-JARs -->
-
-                  <ejbModule>
-                     <groupId>${project.groupId}</groupId>
-                     <artifactId>rhq-enterprise-server</artifactId>
-                     <bundleFileName>rhq-enterprise-server-ejb3.jar</bundleFileName>
-                  </ejbModule>
-
-                  <ejbModule>
-                     <groupId>${project.groupId}</groupId>
-                     <artifactId>rhq-core-domain</artifactId>
-                     <bundleFileName>rhq-core-domain-ejb3.jar</bundleFileName>
-                  </ejbModule>
-
-                  <!-- ** SARs -->
-                  <!--
-                     <sarModule> <groupId>${project.groupId}</groupId>
-                     <artifactId>rhq-enterprise-server-agent-sar</artifactId>
-                     <bundleFileName>rhq-agent.sar</bundleFileName> </sarModule>
-                  -->
-
-                  <!-- ** JARs -->
-
-                  <!--
-                     <jarModule> <groupId>jboss</groupId> <artifactId>jboss-seam</artifactId> <bundleDir>lib</bundleDir>
-                     <includeInApplicationXml>true</includeInApplicationXml> </jarModule>
-                  -->
-               </modules>
-            </configuration>
-         </plugin>
-
-         <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-
-               <execution>
-                  <id>copy-core-agent-plugins</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                     <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                     <artifactItems>
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-platform-plugin</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-agent-plugin</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-jmx-plugin</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-                     </artifactItems>
-                     <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
-                  </configuration>
-               </execution>
-
-               <execution>
-                  <id>copy-core-server-plugins</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                     <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                     <artifactItems>
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-serverplugin-disk</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-serverplugin-url</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-serverplugin-yum</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>rhq-core-perspective</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq.server</groupId>
-                           <artifactId>alert-email</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>alert-irc</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>alert-mobicents</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>alert-microblog</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>alert-operations</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                           <artifactId>alert-roles</artifactId>
-                           <version>${project.version}</version>
-                        </artifactItem>
-
-<!--  TODO:jdk6 - temporarily disabled because of jdk6 requirement
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                            <artifactId>alert-scriptlang</artifactId>
-                            <version>${project.version}</version>
-                        </artifactItem>
--->
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                            <artifactId>alert-snmp</artifactId>
-                            <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                           <groupId>org.rhq</groupId>
-                            <artifactId>alert-subject</artifactId>
-                            <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                          <groupId>org.rhq</groupId>
-                          <artifactId>alert-cli</artifactId>
-                          <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                          <groupId>org.rhq</groupId>
-                          <artifactId>packagetype-cli</artifactId>
-                          <version>${project.version}</version>
-                        </artifactItem>
-
-                        <artifactItem>
-                          <groupId>org.rhq</groupId>
-                          <artifactId>rhq-serverplugin-drift</artifactId>
-                          <version>${project.version}</version>
-                        </artifactItem>
-
-                     </artifactItems>
-                     <outputDirectory>${earDirectory}/rhq-serverplugins</outputDirectory>
-                  </configuration>
-               </execution>
-
-            </executions>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-
-        <profile>
-            <id>bundle-plugins</id>
-            <activation>
-                <property>
-                    <name>java.home</name>
-                </property>
-            </activation>
-
-            <build>
-                <plugins>
-                  <plugin>
-                      <artifactId>maven-dependency-plugin</artifactId>
-                      <executions>
-
-                        <execution>
-                          <id>copy-bundle-agent-plugins</id>
-                          <phase>process-resources</phase>
-                          <goals>
-                             <goal>copy</goal>
-                          </goals>
-                          <configuration>
-                             <artifactItems>
-                               <artifactItem>
-                                 <groupId>org.rhq</groupId>
-                                 <artifactId>rhq-ant-bundle-plugin</artifactId>
-                                 <version>${project.version}</version>
-                               </artifactItem>
-
-                               <artifactItem>
-                                 <groupId>org.rhq</groupId>
-                                 <artifactId>rhq-filetemplate-bundle-plugin</artifactId>
-                                 <version>${project.version}</version>
-                               </artifactItem>
-                             </artifactItems>
-
-                             <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
-                           </configuration>
-                         </execution>
-
-                        <execution>
-                          <id>copy-bundle-server-plugins</id>
-                          <phase>process-resources</phase>
-                          <goals>
-                             <goal>copy</goal>
-                          </goals>
-                          <configuration>
-                             <artifactItems>
-                               <artifactItem>
-                                 <groupId>org.rhq</groupId>
-                                 <artifactId>rhq-serverplugin-ant-bundle</artifactId>
-                                 <version>${project.version}</version>
-                               </artifactItem>
-
-                               <artifactItem>
-                                 <groupId>org.rhq</groupId>
-                                 <artifactId>rhq-serverplugin-filetemplate-bundle</artifactId>
-                                 <version>${project.version}</version>
-                               </artifactItem>
-                             </artifactItems>
-
-                             <outputDirectory>${earDirectory}/rhq-serverplugins</outputDirectory>
-                           </configuration>
-                         </execution>
-                      </executions>
-                  </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>jboss-plugins</id>
-             <activation>
-                <property>
-                   <name>java.home</name>
-                </property>
-             </activation>
-
-             <build>
-               <plugins>
-                 <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-
-                       <execution>
-                          <id>copy-jboss-plugins</id>
-                          <phase>process-resources</phase>
-                          <goals>
-                             <goal>copy</goal>
-                          </goals>
-                          <configuration>
-                             <artifactItems>
+    <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.rhq</groupId>
+        <artifactId>rhq-parent</artifactId>
+        <version>4.5.0-SNAPSHOT</version>
+        <relativePath>../../../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>rhq-enterprise-server-ear</artifactId>
+    <packaging>ear</packaging>
+
+    <name>RHQ Enterprise Server EAR</name>
+    <description>RHQ enterprise server EAR</description>
+
+    <properties>
+        <earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory>
+
+        <!-- dependency versions -->
+        <seam.version>1.2.1.GA</seam.version>
+    </properties>
+
+    <dependencies>
+
+        <!-- Internal Deps -->
+
+        <!-- ** EJB-JARs -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-enterprise-server</artifactId>
+            <version>${project.version}</version>
+            <type>ejb</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-core-domain</artifactId>
+            <version>${project.version}</version>
+            <type>ejb</type>
+        </dependency>
+
+        <!-- ** WARs -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-portal</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-coregui</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-rest</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-content_http</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <!-- ** SARs -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-enterprise-server-services-sar</artifactId>
+            <version>${project.version}</version>
+            <type>sar</type>
+        </dependency>
+
+        <!--
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-enterprise-server-agent-sar</artifactId>
+            <version>${project.version}</version>
+            <type>sar</type>
+        </dependency>
+        -->
+
+        <!-- ** JARs -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-script-bindings</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>rhq-core-domain</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javassist</groupId>
+                    <artifactId>javassist</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-scripting-javascript</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rhq-server-client-api</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>rhq-container-lib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>rhq-enterprise-server</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 3rd Party Deps -->
+
+        <!-- ** WARs -->
+        <dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-remoting-servlet-invoker</artifactId>
+            <version>2x.r3040.jon</version>
+            <type>war</type>
+        </dependency>
+
+        <!-- ** JARs -->
+        <!-- TODO: I think this goes away once we are on AS7 because Postgres JDBC driver will be a module -->
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- TODO: I think the RESTEasy stuff can go away once we are on AS7 -->
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson-provider</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-links</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>${freemarker.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-yaml-provider</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.8</version>
+            <scope>provided</scope>
+
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>${resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>rhq</finalName>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <version>6</version>
+                    <displayName>RHQ</displayName>
+                    <workDirectory>${earDirectory}</workDirectory>
+                    <earSourceDirectory>${basedir}/target/classes</earSourceDirectory>
+                    <defaultJavaBundleDir>lib</defaultJavaBundleDir>
+                    <unpackTypes>war,ejb</unpackTypes>
+
+                    <modules>
+                        <!-- ** WARs -->
+                        <webModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-coregui</artifactId>
+                            <bundleFileName>coregui.war</bundleFileName>
+                            <contextRoot>/coregui</contextRoot>
+                        </webModule>
+
+                        <webModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-portal</artifactId>
+                            <bundleFileName>rhq-portal.war</bundleFileName>
+                            <contextRoot>/</contextRoot>
+                        </webModule>
+
+                        <!-- used to expose content through http -->
+                        <webModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-content_http</artifactId>
+                            <excluded>${exclude-content_http}</excluded>
+                            <bundleFileName>rhq-content_http.war</bundleFileName>
+                            <contextRoot>/content</contextRoot>
+                        </webModule>
+
+                        <webModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-rest</artifactId>
+                            <bundleFileName>rhq-rest.war</bundleFileName>
+                            <contextRoot>/rest</contextRoot>
+                        </webModule>
+
+                        <!-- ** EJB-JARs -->
+                        <ejbModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-enterprise-server</artifactId>
+                            <bundleFileName>rhq-enterprise-server-ejb3.jar</bundleFileName>
+                        </ejbModule>
+
+                        <ejbModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-core-domain</artifactId>
+                            <bundleFileName>rhq-core-domain-ejb3.jar</bundleFileName>
+                        </ejbModule>
+
+                        <!-- ** SARs -->
+
+                        <!-- AS7 allows for SARs embedded in an EAR without anything in application.xml -->
+                        <!-- see https://issues.jboss.org/browse/AS7-1248 -->
+                        <!-- The Maven ear plugin has a bug that causes SARs to be marked as <connector> modules -->
+                        <!-- and there is no way to tell it not to put the SAR in the application.xml so we have -->
+                        <!-- to do things with SARs separately using another maven plugin below -->
+                        <sarModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-enterprise-server-services-sar</artifactId>
+                            <bundleFileName>rhq-services.sar</bundleFileName>
+                            <excluded>true</excluded>
+                        </sarModule>
+
+                        <!--
+                        <sarModule>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>rhq-enterprise-server-agent-sar</artifactId>
+                            <bundleFileName>rhq-agent.sar</bundleFileName>
+                            <excluded>true</excluded>
+                        </sarModule>
+                        -->
+
+                        <!-- ** JARs -->
+
+                    </modules>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+
+                    <execution>
+                        <id>copy-sars</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
                                 <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-augeas-plugin</artifactId>
-                                   <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-enterprise-server-services-sar</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>sar</type>
                                 </artifactItem>
 
+                                <!--
                                 <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-apache-plugin</artifactId>
-                                   <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-enterprise-server-agent-sar</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>sar</type>
                                 </artifactItem>
+                                -->
 
-                                <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-tomcat-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${earDirectory}</outputDirectory>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
 
+                    <execution>
+                        <id>copy-core-agent-plugins</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-jboss-as-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-platform-plugin</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-hibernate-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-agent-plugin</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-rhq-server-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-jmx-plugin</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-jboss-cache-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-ant-bundle-plugin</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-jboss-as-5-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-filetemplate-bundle-plugin</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
+                        </configuration>
+                    </execution>
 
+                    <execution>
+                        <id>copy-core-server-plugins</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
                                 <artifactItem>
-                                  <groupId>org.jboss.on</groupId>
-                                  <artifactId>jopr-jboss-cache-v3-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-ant-bundle</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>modcluster-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-filetemplate-bundle</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-jboss-as-7-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-disk</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
-                             </artifactItems>
-                             <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
-                          </configuration>
-                       </execution>
-
-                    </executions>
-                 </plugin>
-              </plugins>
-           </build>
-        </profile>
-
-        <profile>
-            <id>linux-plugins</id>
-             <activation>
-                <property>
-                   <name>java.home</name>
-                </property>
-             </activation>
-
-             <build>
-               <plugins>
-                 <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-
-                       <execution>
-                          <id>copy-linux-plugins</id>
-                          <phase>process-resources</phase>
-                          <goals>
-                             <goal>copy</goal>
-                          </goals>
-                          <configuration>
-                             <artifactItems>
 
                                 <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-augeas-plugin</artifactId>
-                                   <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-url</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-cron-plugin</artifactId>
-                                   <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-yum</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
+                                <!-- TODO: remove this once all JSF pages are gone -->
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-script-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-core-perspective</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
-<!-- TODO:jdk6 temporarily disabled because of jdk6 requirement
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-script2-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}.server</groupId>
+                                    <artifactId>alert-email</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
--->
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-grub-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-irc</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-hosts-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-mobicents</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-cobbler-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-microblog</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-sudoers-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-operations</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-netservices-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-roles</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-samba-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-snmp</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-postfix-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-subject</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-aliases-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-cli</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-sshd-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>packagetype-cli</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
-<!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
 
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-virt-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>rhq-serverplugin-drift</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
 
+                                <!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
                                 <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-kickstart-plugin</artifactId>
-                                  <version>${project.version}</version>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>alert-scriptlang</artifactId>
+                                    <version>${project.version}</version>
                                 </artifactItem>
+                                -->
 
--->
-                             </artifactItems>
-                             <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
-                          </configuration>
-                       </execution>
+                            </artifactItems>
+                            <outputDirectory>${earDirectory}/rhq-serverplugins</outputDirectory>
+                        </configuration>
+                    </execution>
 
-                    </executions>
-                 </plugin>
-              </plugins>
-           </build>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-        </profile>
+    <profiles>
 
         <profile>
-            <id>misc-plugins</id>
-             <activation>
+            <id>jboss-plugins</id>
+            <activation>
                 <property>
-                   <name>java.home</name>
+                    <name>java.home</name>
                 </property>
-             </activation>
-
-             <build>
-               <plugins>
-                 <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-
-                       <execution>
-                          <id>copy-misc-plugins</id>
-                          <phase>process-resources</phase>
-                          <goals>
-                             <goal>copy</goal>
-                          </goals>
-                          <configuration>
-                             <artifactItems>
-
-                                <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-hudson-plugin</artifactId>
-                                   <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                   <groupId>org.rhq</groupId>
-                                   <artifactId>rhq-iis-plugin</artifactId>
-                                   <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-database-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-postgres-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-mysql-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-oracle-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-perftest-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-snmptrapd-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-twitter-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                                <artifactItem>
-                                  <groupId>org.rhq</groupId>
-                                  <artifactId>rhq-filetemplate-bundle-plugin</artifactId>
-                                  <version>${project.version}</version>
-                                </artifactItem>
-
-                             </artifactItems>
-                             <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
-                          </configuration>
-                       </execution>
-
-                    </executions>
-                 </plugin>
-              </plugins>
-           </build>
+            </activation>
 
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+
+                            <execution>
+                                <id>copy-jboss-plugins</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-augeas-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-apache-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-tomcat-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-jboss-as-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-hibernate-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-rhq-server-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-jboss-cache-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-jboss-as-5-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.jboss.on</groupId>
+                                            <artifactId>jopr-jboss-cache-v3-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>modcluster-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-jboss-as-7-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
-      <profile>
-         <id>dev</id>
-
-         <properties>
-            <rhq.rootDir>../../../..</rhq.rootDir>
-            <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-            <rhq.deploymentName>${project.build.finalName}.ear</rhq.deploymentName>
-            <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir>
-         </properties>
+        <profile>
+            <id>linux-plugins</id>
+            <activation>
+                <property>
+                    <name>java.home</name>
+                </property>
+            </activation>
 
-         <build>
-            <plugins>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+
+                            <execution>
+                                <id>copy-linux-plugins</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-augeas-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-cron-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-script-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-grub-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-hosts-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-cobbler-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-sudoers-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-netservices-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-samba-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-postfix-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-aliases-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-sshd-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-script2-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-virt-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-kickstart-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+                                        -->
+                                    </artifactItems>
+                                    <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-               <plugin>
-                  <artifactId>maven-antrun-plugin</artifactId>
-                  <executions>
+        <profile>
+            <id>misc-plugins</id>
+            <activation>
+                <property>
+                    <name>java.home</name>
+                </property>
+            </activation>
 
-                     <execution>
-                        <id>deploy</id>
-                        <phase>package</phase>
-                        <configuration>
-                           <target>
-                              <property name="deployment.dir" location="${rhq.deploymentDir}" />
-                              <echo>*** Copying updated files from
-                                 target${file.separator}${project.build.finalName}${file.separator} to
-                                 ${deployment.dir}${file.separator}...</echo>
-                              <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
-                                 <fileset dir="${basedir}/target/${project.build.finalName}" />
-                              </copy>
-                              <property name="deployment.descriptor.file" location="${deployment.dir}/META-INF/application.xml" />
-                              <echo>*** Touching ${deployment.descriptor.file} to force redeployment of
-                                 ${rhq.deploymentName}...</echo>
-                              <touch file="${deployment.descriptor.file}" />
-                           </target>
-                        </configuration>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                     </execution>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+
+                            <execution>
+                                <id>copy-misc-plugins</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-hudson-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-iis-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-database-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-postgres-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-mysql-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-oracle-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-perftest-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-snmptrapd-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-twitter-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>${project.groupId}</groupId>
+                                            <artifactId>rhq-filetemplate-bundle-plugin</artifactId>
+                                            <version>${project.version}</version>
+                                        </artifactItem>
+
+                                    </artifactItems>
+                                    <outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
+                                </configuration>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-                     <execution>
-                        <id>deploy-ear-meta-inf</id>
-                        <phase>package</phase>
-                        <configuration>
-                           <target>
-                              <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}">
-                                 <patternset>
-                                    <include name="META-INF/**" />
-                                 </patternset>
-                              </unjar>
-                           </target>
-                        </configuration>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                     </execution>
+        <profile>
+            <id>dev</id>
 
-                     <execution>
-                        <id>undeploy</id>
-                        <phase>clean</phase>
-                        <configuration>
-                           <target>
-                              <property name="deployment.dir" location="${rhq.deploymentDir}" />
-                              <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
-                              <delete dir="${deployment.dir}" />
-                           </target>
-                        </configuration>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                     </execution>
+            <properties>
+                <rhq.rootDir>../../../..</rhq.rootDir>
+                <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+                <rhq.deploymentName>${project.build.finalName}.ear</rhq.deploymentName>
+                <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir>
+                    </properties>
 
-                  </executions>
-               </plugin>
+            <build>
+                <plugins>
 
-            </plugins>
-         </build>
-      </profile>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+
+                            <execution>
+                                <id>deploy</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <property name="deployment.dir" location="${rhq.deploymentDir}" />
+                                        <echo>*** Copying updated files from
+                                            target${file.separator}${project.build.finalName}${file.separator}
+                                            to
+                                            ${deployment.dir}${file.separator}...</echo>
+                                        <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
+                                            <fileset dir="${basedir}/target/${project.build.finalName}" />
+                                        </copy>
+                                        <property name="dodeploy.file" location="${deployment.dir}.dodeploy" />
+                                        <echo>*** Touching ${dodeploy.file} to force redeployment of ${rhq.deploymentName}</echo>
+                                        <touch file="${dodeploy.file}" />
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                            <execution>
+                                <id>deploy-ear-meta-inf</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <unjar src="${project.build.directory}/${project.build.finalName}.ear"
+                                               dest="${rhq.deploymentDir}">
+                                            <patternset>
+                                                <include name="META-INF/**" />
+                                            </patternset>
+                                        </unjar>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>clean</phase>
+                                <configuration>
+                                    <target>
+                                        <property name="deployment.dir" location="${rhq.deploymentDir}" />
+                                        <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
+                                        <delete dir="${deployment.dir}" />
+                                        <property name="dodeploy.file" location="${deployment.dir}.dodeploy" />
+                                        <delete file="${dodeploy.file}" />
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-   </profiles>
+    </profiles>
 
 </project>
 
diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/README.txt b/modules/enterprise/server/ear/src/main/application/META-INF/README.txt
new file mode 100644
index 0000000..7938d59
--- /dev/null
+++ b/modules/enterprise/server/ear/src/main/application/META-INF/README.txt
@@ -0,0 +1,2 @@
+This is the location where our EAR can put META-INF configuration files.
+This file is really just a placeholder. We can delete it when we get actual content for META-INF.
\ No newline at end of file
diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-app.xml b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-app.xml
deleted file mode 100644
index 91dc5dd..0000000
--- a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-app.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<jboss-app>
-
-  <module>
-    <service>server-comm-service.xml</service>
-  </module>
-
-  <module>
-    <service>quartz-scheduler-service.xml</service>
-  </module>
-
-  <module>
-    <service>custom-jaas-deployment-service.xml</service>
-  </module>
-
-  <module>
-    <service>product-plugin-service.xml</service>
-  </module>
-
-  <module>
-    <service>mq-service.xml</service>
-  </module>
-
-  <module>
-    <service>server-service.xml</service>
-  </module>
-
-</jboss-app>
diff --git a/modules/enterprise/server/ear/src/main/resources/custom-jaas-deployment-service.xml b/modules/enterprise/server/ear/src/main/resources/custom-jaas-deployment-service.xml
deleted file mode 100644
index 1b66762..0000000
--- a/modules/enterprise/server/ear/src/main/resources/custom-jaas-deployment-service.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE server>
-
-<server>
-
-    <mbean code="org.rhq.enterprise.server.core.CustomJaasDeploymentService"
-           name="rhq:service=CustomJaasDeployment">
-        <depends>jboss.jca:service=XATxCM,name=RHQDS</depends>
-    </mbean>
-
-</server>
diff --git a/modules/enterprise/server/ear/src/main/resources/mq-service.xml b/modules/enterprise/server/ear/src/main/resources/mq-service.xml
deleted file mode 100644
index fe17477..0000000
--- a/modules/enterprise/server/ear/src/main/resources/mq-service.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<server>
-  <!-- 
-  Destination without a configured SecurityManager or without a SecurityConf
-  will default to role guest with read=true, write=true, create=false.
-  -->
-  
-  <!--
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=agentScheduleQueue">
-    <depends>jboss.mq.destination:service=Topic,name=eventsTopic</depends>
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=monitorAlarmQueue">
-    <depends>jboss.mq.destination:service=Topic,name=eventsTopic</depends>
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  
-  <mbean code="org.jboss.mq.server.jmx.Topic"
-     name="jboss.mq.destination:service=Topic,name=eventsTopic">
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  
-  <mbean code="org.jboss.mq.server.jmx.Queue"
-    name="jboss.mq.destination:service=Queue,name=monitorRtQueue">
-    <depends>jboss.mq.destination:service=Topic,name=eventsTopic</depends>
-    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-  </mbean>
-  -->
-
-</server>
diff --git a/modules/enterprise/server/ear/src/main/resources/product-plugin-service.xml b/modules/enterprise/server/ear/src/main/resources/product-plugin-service.xml
deleted file mode 100644
index 4fc8136..0000000
--- a/modules/enterprise/server/ear/src/main/resources/product-plugin-service.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE server>
-
-<server>
-  <mbean code="org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner"
-	      name="rhq:service=PluginDeploymentScanner">
-    <attribute name="ScanPeriod">${rhq.server.plugin-scan-period-ms:300000}</attribute>
-    <attribute name="AgentPluginDir">${jboss.server.home.dir}/deploy/${rhq.earName}/rhq-downloads/rhq-plugins</attribute>
-    <attribute name="ServerPluginDir">${jboss.server.home.dir}/deploy/${rhq.earName}/rhq-serverplugins</attribute>
-    <attribute name="UserPluginDir">${jboss.home.dir}/../plugins</attribute>
-  </mbean>
-</server>
diff --git a/modules/enterprise/server/ear/src/main/resources/quartz-scheduler-service.xml b/modules/enterprise/server/ear/src/main/resources/quartz-scheduler-service.xml
deleted file mode 100644
index f6ac428..0000000
--- a/modules/enterprise/server/ear/src/main/resources/quartz-scheduler-service.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<server>
-  <mbean code="org.rhq.enterprise.server.scheduler.SchedulerService"
-         name="rhq:service=scheduler">
-    <depends>jboss.jca:service=XATxCM,name=RHQDS</depends>
-
-    <attribute name="QuartzProperties">
-# RHQ custom property that defines the default timeout for all operations.
-# This is specified in seconds.  If any operation takes longer than this, it is assumed to have failed.
-rhq.server.operation-timeout = ${rhq.server.operation-timeout:600}
-
-# scheduler factory config
-org.quartz.scheduler.instanceName = RHQScheduler
-org.quartz.scheduler.instanceId   = AUTO
-
-# thread pool config
-org.quartz.threadPool.class       = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 5
-
-# database config
-# note that the delegate class property should be set at build/installation time
-org.quartz.jobStore.class                      = org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass        = ${rhq.server.quartz.driverDelegateClass}
-org.quartz.jobStore.isClustered                = true
-org.quartz.jobStore.clusterCheckinInterval     = 30000
-org.quartz.jobStore.tablePrefix                = RHQ_QRTZ_
-org.quartz.jobStore.useProperties              = true
-org.quartz.jobStore.selectWithLockSQL          = ${rhq.server.quartz.selectWithLockSQL}
-org.quartz.jobStore.dataSource                 = RHQDS
-org.quartz.dataSource.RHQDS.jndiURL            = java:/RHQDS
-org.quartz.dataSource.RHQDS.maxConnections     = 10
-org.quartz.jobStore.nonManagedTXDataSource     = NoTxRHQDS
-org.quartz.dataSource.NoTxRHQDS.jndiURL        = java:/NoTxRHQDS
-org.quartz.dataSource.NoTxRHQDS.maxConnections = 10
-org.quartz.jobStore.lockHandler.class          = ${rhq.server.quartz.lockHandlerClass}
-    </attribute>
-  </mbean>
-</server>
diff --git a/modules/enterprise/server/ear/src/main/resources/server-comm-service.xml b/modules/enterprise/server/ear/src/main/resources/server-comm-service.xml
deleted file mode 100644
index b6cff68..0000000
--- a/modules/enterprise/server/ear/src/main/resources/server-comm-service.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jboss-service.xml,v 1.3.2.12 2006/03/10 19:26:40 asaldhana Exp $ -->
-
-<server> 
-
-   <mbean code="org.rhq.enterprise.server.core.comm.ServerCommunicationsService"
-          name="rhq:service=ServerCommunications">
-
-      <!--
-      <attribute name="ConfigurationFile">${jboss.server.config.url}/server-comm-configuration.xml</attribute> 
-      -->
-
-      <attribute name="ConfigurationOverrides" serialDataType="jbxb">
-         <java:properties xmlns:java="urn:jboss:java-properties"
-                          xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-                          xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
-
-            <!-- location of the plugin jars and other files agents can download directly from sever -->
-
-            <java:property>
-               <java:key>rhq.server.agent-files-directory</java:key>
-               <java:value>${jboss.server.home.dir}/deploy/${rhq.earName}/rhq-downloads</java:value>
-            </java:property>
-
-            <!-- location where data files can be stored -->
-
-            <java:property>
-               <java:key>rhq.communications.data-directory</java:key>
-               <java:value>${jboss.server.data.dir}</java:value>
-            </java:property>
-
-            <!-- global limit on number of concurrent incoming messages allowed -->
-
-            <java:property>
-               <java:key>rhq.communications.global-concurrency-limit</java:key>
-               <java:value>${rhq.communications.global-concurrency-limit:200}</java:value>
-            </java:property>
-
-            <!-- JON Server's remote endpoint for agents to talk to -->
-
-            <java:property>
-               <java:key>rhq.communications.connector.transport</java:key>
-               <java:value>${rhq.communications.connector.transport:servlet}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.bind-address</java:key>
-               <java:value>${rhq.communications.connector.bind-address}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.bind-port</java:key>
-               <java:value>${rhq.communications.connector.bind-port:7080}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.transport-params</java:key>
-               <java:value>${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}</java:value>
-            </java:property>
-
-            <!-- Multicast detector configuration for auto-discovery -->
-
-            <java:property>
-               <java:key>rhq.communications.multicast-detector.enabled</java:key>
-               <java:value>${rhq.communications.multicast-detector.enabled:false}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.multicast-detector.multicast-address</java:key>
-               <java:value>${rhq.communications.multicast-detector.multicast-address:224.16.16.16}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.multicast-detector.bind-address</java:key>
-               <java:value>${rhq.communications.multicast-detector.bind-address}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.multicast-detector.port</java:key>
-               <java:value>${rhq.communications.multicast-detector.port:16162}</java:value>
-            </java:property>
-
-            <!-- Server-side SSL Security Configuration (for incoming messages from agents) -->
-
-            <java:property>
-               <java:key>rhq.communications.connector.security.secure-socket-protocol</java:key>
-               <java:value>${rhq.communications.connector.security.secure-socket-protocol:TLS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.file</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.file}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.algorithm</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.algorithm:SunX509}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.type</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.type:JKS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.password</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.password:rhqpwd}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.key-password</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.key-password:rhqpwd}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.keystore.alias</java:key>
-               <java:value>${rhq.communications.connector.security.keystore.alias:rhq}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.truststore.file</java:key>
-               <java:value>${rhq.communications.connector.security.truststore.file}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.truststore.algorithm</java:key>
-               <java:value>${rhq.communications.connector.security.truststore.algorithm:SunX509}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.truststore.type</java:key>
-               <java:value>${rhq.communications.connector.security.truststore.type:JKS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.truststore.password</java:key>
-               <java:value>${rhq.communications.connector.security.truststore.password}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.communications.connector.security.client-auth-mode</java:key>
-               <java:value>${rhq.communications.connector.security.client-auth-mode:none}</java:value>
-            </java:property>
-
-
-            <!-- Client-side SSL Security Configuration (for outgoing messages to agents) -->
-
-            <java:property>
-               <java:key>rhq.server.client.security.secure-socket-protocol</java:key>
-               <java:value>${rhq.server.client.security.secure-socket-protocol:TLS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.file</java:key>
-               <java:value>${rhq.server.client.security.keystore.file}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.algorithm</java:key>
-               <java:value>${rhq.server.client.security.keystore.algorithm:SunX509}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.type</java:key>
-               <java:value>${rhq.server.client.security.keystore.type:JKS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.password</java:key>
-               <java:value>${rhq.server.client.security.keystore.password:rhqpwd}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.key-password</java:key>
-               <java:value>${rhq.server.client.security.keystore.key-password:rhqpwd}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.keystore.alias</java:key>
-               <java:value>${rhq.server.client.security.keystore.alias:rhq}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.truststore.file</java:key>
-               <java:value>${rhq.server.client.security.truststore.file}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.truststore.algorithm</java:key>
-               <java:value>${rhq.server.client.security.truststore.algorithm:SunX509}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.truststore.type</java:key>
-               <java:value>${rhq.server.client.security.truststore.type:JKS}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.truststore.password</java:key>
-               <java:value>${rhq.server.client.security.truststore.password}</java:value>
-            </java:property>
-            <java:property>
-               <java:key>rhq.server.client.security.server-auth-mode-enabled</java:key>
-               <java:value>${rhq.server.client.security.server-auth-mode-enabled:false}</java:value>
-            </java:property>
-         </java:properties> 
-      </attribute> 
-   </mbean>
-
-</server>
diff --git a/modules/enterprise/server/ear/src/main/resources/server-service.xml b/modules/enterprise/server/ear/src/main/resources/server-service.xml
deleted file mode 100644
index 201c938..0000000
--- a/modules/enterprise/server/ear/src/main/resources/server-service.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<server>
-   
-   <mbean code="org.rhq.enterprise.server.core.CoreServer"
-          name="rhq:service=CoreServer"/>
-
-   <mbean code="org.rhq.enterprise.server.measurement.instrumentation.MeasurementMonitor"
-          name="rhq:service=MeasurementMonitor"/>
-
-   <mbean code="org.rhq.enterprise.server.alert.engine.mbean.AlertConditionCacheMonitor"
-          name="rhq:service=AlertConditionCacheMonitor"/>
-
-   <mbean code="org.rhq.enterprise.server.resource.group.definition.mbean.GroupDefinitionRecalculationThreadMonitor"
-          name="rhq:service=GroupDefinitionRecalculationThreadMonitor"/>
-
-</server>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index b52363c..d4e9f23 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -31,6 +31,7 @@
 
   <modules>
     <module>agent-sar</module>
+    <module>services-sar</module>
   </modules>
 
   <pluginRepositories>
diff --git a/modules/enterprise/server/sars/services-sar/pom.xml b/modules/enterprise/server/sars/services-sar/pom.xml
new file mode 100644
index 0000000..143982e
--- /dev/null
+++ b/modules/enterprise/server/sars/services-sar/pom.xml
@@ -0,0 +1,123 @@
+<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>
+
+    <parent>
+        <groupId>org.rhq</groupId>
+        <artifactId>rhq-enterprise-server-sars-parent</artifactId>
+        <version>4.5.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.rhq</groupId>
+    <artifactId>rhq-enterprise-server-services-sar</artifactId>
+    <packaging>jboss-sar</packaging>
+
+    <name>RHQ Enterprise Server Internal Services SAR</name>
+    <description>The SAR that provides the server with some necessary internal RHQ services.</description>
+
+    <properties>
+        <sarDirectory>${project.build.directory}/${project.build.finalName}</sarDirectory>
+    </properties>
+
+    <build>
+        <finalName>rhq-enterprise-server-services-sar</finalName>
+        
+        <!-- we don't need this right now - only if we need deps stored in the sar META-INF/lib/ will we need this -->
+        <!-- NOTE: extensions=true below allows Maven to grok the jboss-sar packaging type -->
+        <!--
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jboss-packaging-maven-plugin</artifactId>
+                <version>1.9.99</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <libDirectory>${sarDirectory}/META-INF/lib</libDirectory>
+                </configuration>
+            </plugin>
+
+        </plugins>
+        -->
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+
+        <profile>
+            <id>dev</id>
+
+            <properties>
+                <rhq.rootDir>../../../../..</rhq.rootDir>
+                <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+                <rhq.deploymentName>${project.build.finalName}.sar</rhq.deploymentName>
+                <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir>
+            </properties>
+
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+
+                            <execution>
+                                <id>deploy</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <property name="deployment.dir" location="${rhq.deploymentDir}" />
+                                        <echo>*** Copying updated files
+                                            from
+                                            target${file.separator}classes${file.separator}
+                                            to
+                                            ${deployment.dir}${file.separator}...</echo>
+                                        <jar destfile="${deployment.dir}">
+                                            <fileset dir="target/${project.build.finalName}" />
+                                        </jar>
+                                        <property name="dodeploy.file" location="${deployment.dir}/../../${rhq.earName}.dodeploy" />
+                                        <property name="skipdeploy.file" location="${deployment.dir}/../../${rhq.earName}.skipdeploy" />
+                                        <property name="failed.file" location="${deployment.dir}/../../${rhq.earName}.failed" />
+                                        <echo>*** Touching ${dodeploy.file} to force redeployment of ${rhq.deploymentName}...</echo>
+                                        <touch file="${dodeploy.file}" />
+                                        <delete file="${skipdeploy.file}" /> <!-- in case this exists -->
+                                        <delete file="${failed.file}" /> <!-- in case this exists -->
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy</id>
+                                <phase>clean</phase>
+                                <configuration>
+                                    <target>
+                                        <property name="deployment.dir" location="${rhq.deploymentDir}" />
+                                        <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
+                                        <delete file="${deployment.dir}" />
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
new file mode 100644
index 0000000..deae6c2
--- /dev/null
+++ b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="urn:jboss:service:7.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
+
+    <!-- TODO: need to figure out how to port this to AS7
+    <mbean code="org.rhq.enterprise.server.core.CustomJaasDeploymentService"
+           name="rhq:service=CustomJaasDeployment">
+        <depends>jboss.jca:service=XATxCM,name=RHQDS</depends>
+    </mbean>
+    -->
+
+    <mbean code="org.rhq.enterprise.server.core.CoreServer"
+           name="rhq:service=CoreServer" />
+
+    <mbean code="org.rhq.enterprise.server.measurement.instrumentation.MeasurementMonitor"
+           name="rhq:service=MeasurementMonitor" />
+
+    <mbean code="org.rhq.enterprise.server.alert.engine.mbean.AlertConditionCacheMonitor"
+           name="rhq:service=AlertConditionCacheMonitor" />
+
+    <mbean code="org.rhq.enterprise.server.resource.group.definition.mbean.GroupDefinitionRecalculationThreadMonitor"
+           name="rhq:service=GroupDefinitionRecalculationThreadMonitor" />
+
+    <mbean code="org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner"
+           name="rhq:service=PluginDeploymentScanner">
+        <attribute name="ScanPeriod">${rhq.server.plugin-scan-period-ms:300000}</attribute>
+        <attribute name="AgentPluginDir">${jboss.home.dir}/standalone/deployments/${rhq.earName}/rhq-downloads/rhq-plugins</attribute>
+        <attribute name="ServerPluginDir">${jboss.home.dir}/standalone/deployments/${rhq.earName}/rhq-serverplugins</attribute>
+        <attribute name="UserPluginDir">${jboss.home.dir}/../plugins</attribute>
+    </mbean>
+
+    <mbean code="org.rhq.enterprise.server.scheduler.SchedulerService"
+           name="rhq:service=scheduler">
+        <attribute name="QuartzProperties">
+# RHQ custom property that defines the default timeout for all operations.
+# This is specified in seconds.  If any operation takes longer than this, it is assumed to have failed.
+rhq.server.operation-timeout = ${rhq.server.operation-timeout:600}
+
+# scheduler factory config
+org.quartz.scheduler.instanceName = RHQScheduler
+org.quartz.scheduler.instanceId   = AUTO
+
+# thread pool config
+org.quartz.threadPool.class       = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 5
+
+# database config
+# note that the delegate class property should be set at build/installation time
+org.quartz.jobStore.class                      = org.quartz.impl.jdbcjobstore.JobStoreCMT
+org.quartz.jobStore.driverDelegateClass        = ${rhq.server.quartz.driverDelegateClass}
+org.quartz.jobStore.isClustered                = true
+org.quartz.jobStore.clusterCheckinInterval     = 30000
+org.quartz.jobStore.tablePrefix                = RHQ_QRTZ_
+org.quartz.jobStore.useProperties              = true
+org.quartz.jobStore.selectWithLockSQL          = ${rhq.server.quartz.selectWithLockSQL}
+org.quartz.jobStore.dataSource                 = RHQDS
+org.quartz.dataSource.RHQDS.jndiURL            = java:/RHQDS
+org.quartz.dataSource.RHQDS.maxConnections     = 10
+org.quartz.jobStore.nonManagedTXDataSource     = NoTxRHQDS
+org.quartz.dataSource.NoTxRHQDS.jndiURL        = java:/NoTxRHQDS
+org.quartz.dataSource.NoTxRHQDS.maxConnections = 10
+org.quartz.jobStore.lockHandler.class          = ${rhq.server.quartz.lockHandlerClass}
+        </attribute>
+    </mbean>
+
+    <mbean code="org.rhq.enterprise.server.core.comm.ServerCommunicationsService"
+           name="rhq:service=ServerCommunications">
+
+        <!--
+        <attribute name="ConfigurationFile">.../server-comm-configuration.xml</attribute>
+        -->
+
+        <attribute name="ConfigurationOverrides" serialDataType="jbxb">
+            <java:properties xmlns:java="urn:jboss:java-properties"
+                             xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+                             xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+
+                <!-- location of the plugin jars and other files agents can download directly from sever -->
+
+                <java:property>
+                    <java:key>rhq.server.agent-files-directory</java:key>
+                    <java:value>${jboss.home.dir}/standalone/deployments/${rhq.earName}/rhq-downloads</java:value>
+                </java:property>
+
+                <!-- location where data files can be stored -->
+
+                <java:property>
+                    <java:key>rhq.communications.data-directory</java:key>
+                    <java:value>${jboss.server.data.dir}</java:value>
+                </java:property>
+
+                <!-- global limit on number of concurrent incoming messages allowed -->
+
+                <java:property>
+                    <java:key>rhq.communications.global-concurrency-limit</java:key>
+                    <java:value>${rhq.communications.global-concurrency-limit:200}</java:value>
+                </java:property>
+
+                <!-- Server's remote endpoint for agents to talk to -->
+
+                <java:property>
+                    <java:key>rhq.communications.connector.transport</java:key>
+                    <java:value>${rhq.communications.connector.transport:servlet}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.bind-address</java:key>
+                    <java:value>${rhq.communications.connector.bind-address}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.bind-port</java:key>
+                    <java:value>${rhq.communications.connector.bind-port:7080}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.transport-params</java:key>
+                    <java:value>${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}</java:value>
+                </java:property>
+
+                <!-- Multicast detector configuration for auto-discovery -->
+
+                <java:property>
+                    <java:key>rhq.communications.multicast-detector.enabled</java:key>
+                    <java:value>${rhq.communications.multicast-detector.enabled:false}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.multicast-detector.multicast-address</java:key>
+                    <java:value>${rhq.communications.multicast-detector.multicast-address:224.16.16.16}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.multicast-detector.bind-address</java:key>
+                    <java:value>${rhq.communications.multicast-detector.bind-address}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.multicast-detector.port</java:key>
+                    <java:value>${rhq.communications.multicast-detector.port:16162}</java:value>
+                </java:property>
+
+                <!-- Server-side SSL Security Configuration (for incoming messages from agents) -->
+
+                <java:property>
+                    <java:key>rhq.communications.connector.security.secure-socket-protocol</java:key>
+                    <java:value>${rhq.communications.connector.security.secure-socket-protocol:TLS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.file</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.file}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.algorithm</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.algorithm:SunX509}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.type</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.type:JKS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.password</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.password:rhqpwd}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.key-password</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.key-password:rhqpwd}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.keystore.alias</java:key>
+                    <java:value>${rhq.communications.connector.security.keystore.alias:rhq}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.truststore.file</java:key>
+                    <java:value>${rhq.communications.connector.security.truststore.file}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.truststore.algorithm</java:key>
+                    <java:value>${rhq.communications.connector.security.truststore.algorithm:SunX509}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.truststore.type</java:key>
+                    <java:value>${rhq.communications.connector.security.truststore.type:JKS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.truststore.password</java:key>
+                    <java:value>${rhq.communications.connector.security.truststore.password}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.communications.connector.security.client-auth-mode</java:key>
+                    <java:value>${rhq.communications.connector.security.client-auth-mode:none}</java:value>
+                </java:property>
+
+                <!-- Client-side SSL Security Configuration (for outgoing messages to agents) -->
+
+                <java:property>
+                    <java:key>rhq.server.client.security.secure-socket-protocol</java:key>
+                    <java:value>${rhq.server.client.security.secure-socket-protocol:TLS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.file</java:key>
+                    <java:value>${rhq.server.client.security.keystore.file}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.algorithm</java:key>
+                    <java:value>${rhq.server.client.security.keystore.algorithm:SunX509}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.type</java:key>
+                    <java:value>${rhq.server.client.security.keystore.type:JKS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.password</java:key>
+                    <java:value>${rhq.server.client.security.keystore.password:rhqpwd}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.key-password</java:key>
+                    <java:value>${rhq.server.client.security.keystore.key-password:rhqpwd}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.keystore.alias</java:key>
+                    <java:value>${rhq.server.client.security.keystore.alias:rhq}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.truststore.file</java:key>
+                    <java:value>${rhq.server.client.security.truststore.file}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.truststore.algorithm</java:key>
+                    <java:value>${rhq.server.client.security.truststore.algorithm:SunX509}</java:value>
+                </java:property>
+                <java:property>
+                   <java:key>rhq.server.client.security.truststore.type</java:key>
+                   <java:value>${rhq.server.client.security.truststore.type:JKS}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.truststore.password</java:key>
+                    <java:value>${rhq.server.client.security.truststore.password}</java:value>
+                </java:property>
+                <java:property>
+                    <java:key>rhq.server.client.security.server-auth-mode-enabled</java:key>
+                    <java:value>${rhq.server.client.security.server-auth-mode-enabled:false}</java:value>
+                </java:property>
+            </java:properties>
+        </attribute>
+    </mbean>
+</server>




More information about the rhq-commits mailing list