modules/core/client-api/pom.xml | 437 ++---
modules/enterprise/gui/coregui/pom.xml | 773 ++++-----
modules/enterprise/server/jar/pom.xml | 2108 +++++++++++++-------------
modules/enterprise/server/xml-schemas/pom.xml | 465 ++---
modules/plugins/perftest/pom.xml | 472 ++---
5 files changed, 2139 insertions(+), 2116 deletions(-)
New commits:
commit 4699b70c9bde96b1c95c89e7e9b32e6ff73ad860
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Jun 27 15:55:28 2012 +0200
formatting only
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 834ad85..6f6a937 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -1,285 +1,288 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-parent</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <packaging>jar</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <packaging>jar</packaging>
- <name>RHQ Client API</name>
- <description>Server and Client APIs for invoking operations on the RHQ plugin
container</description>
+ <name>RHQ Client API</name>
+ <description>Server and Client APIs for invoking operations on the RHQ plugin
container</description>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-comm-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-comm-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-common-drift</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-common-drift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- TODO: This is a fix for the Javac bug requiring annotations to be
available when compiling dependent classes; it is fixed in JDK 6.
-->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>1.0.0.Alpha9</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>hibernate-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope>
<!-- set scope to 'provided', so Hibernate annotations can be used in
the entities -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>1.0.0.Alpha9</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
<!--<scope>test</scope> not sure about this -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
<configuration>
-
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ <includes>
+ <include>org/rhq/core/clientapi/shared/**</include>
+ </includes>
</configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
<configuration>
- <source>1.6</source>
+ <sources>
+ <source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
</configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <includes>
- <include>org/rhq/core/clientapi/shared/**</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <profiles>
+
+ <profile>
+ <id>dev</id>
+
+ <properties>
+ <rhq.rootDir>../../..</rhq.rootDir>
+
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir>
+ </properties>
+
+ <build>
+ <plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
+
<execution>
- <id>add-xjc-source</id>
- <phase>generate-sources</phase>
+ <id>deploy</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${rhq.deploymentDir}"/>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating ${deployment.file}...</echo>
+ <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}"/>
+ </target>
+ </configuration>
<goals>
- <goal>add-source</goal>
+ <goal>run</goal>
</goals>
+ </execution>
+
+ <execution>
+ <id>undeploy</id>
+ <phase>clean</phase>
<configuration>
- <sources>
- <source>${basedir}/target/generated-sources/xjc</source>
- </sources>
+ <target>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Deleting ${deployment.file}...</echo>
+ <delete file="${deployment.file}"/>
+ </target>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
+
</executions>
</plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../..</rhq.rootDir>
-
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>deploy</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <mkdir dir="${rhq.deploymentDir}" />
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>${cobertura.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
<execution>
- <id>cobertura-instrument</id>
- <phase>process-test-classes</phase>
- <configuration>
- <target>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <target>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/cobertura/backup"/>
<!-- backup all classes so that we can instrument the original
classes-->
- <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
+ <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
<fileset dir="target/classes">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- create a properties file and save there location of cobertura
data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <touch file="target/classes/cobertura.properties"/>
+ <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- instrument all classes in target/classes directory -->
- <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
+ <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
</fileset>
</cobertura-instrument>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
<execution>
- <id>cobertura-report</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/site/cobertura"/>
<!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true"
overwrite="true">
+ <copy toDir="target/classes" verbose="true"
overwrite="true">
<fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
+ <delete dir="target/cobertura/backup"/>
<!-- create a code coverage report -->
- <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
destdir="${project.build.directory}/site/cobertura">
+ <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ destdir="${project.build.directory}/site/cobertura">
<fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
- </cobertura-report>
+ </cobertura-report>
<!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <delete file="target/classes/cobertura.properties"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/enterprise/gui/coregui/pom.xml
b/modules/enterprise/gui/coregui/pom.xml
index 29662c8..e3aca30 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -1,33 +1,34 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.rhq</groupId>
- <artifactId>rhq-coregui</artifactId>
- <packaging>war</packaging>
+ <artifactId>rhq-parent</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-coregui</artifactId>
+ <packaging>war</packaging>
- <name>RHQ Enterprise Core GUI</name>
- <description>the RHQ Enterprise Core GUI webapp</description>
+ <name>RHQ Enterprise Core GUI</name>
+ <description>the RHQ Enterprise Core GUI webapp</description>
- <properties>
+ <properties>
<!-- dependency versions -->
- <gwt.version>2.4.0</gwt.version>
- <smartgwt.version>3.0</smartgwt.version>
+ <gwt.version>2.4.0</gwt.version>
+ <smartgwt.version>3.0</smartgwt.version>
<!-- If this is too much memory to allocate to your gwt:debug process then
override this property in
in your settings.xml -->
- <gwt-plugin.extraJvmArgs>-Xms512M -Xmx512M -XX:PermSize=128M
-XX:MaxPermSize=256M</gwt-plugin.extraJvmArgs>
- <gwt-plugin.localWorkers>4</gwt-plugin.localWorkers>
+ <gwt-plugin.extraJvmArgs>-Xms512M -Xmx512M -XX:PermSize=128M
-XX:MaxPermSize=256M</gwt-plugin.extraJvmArgs>
+ <gwt-plugin.localWorkers>4</gwt-plugin.localWorkers>
- <coreGuiParams />
-
<coreGuiRunTarget>'http://localhost:7080/coregui/CoreGUI.html${coreGuiParams}'</coreGuiRunTarget>
+ <coreGuiParams/>
+
<coreGuiRunTarget>'http://localhost:7080/coregui/CoreGUI.html${coreGuiParams}'</coreGuiRunTarget>
<!--
This property is substituted, by the resource plugin during the resources phase,
as the
@@ -52,201 +53,201 @@
Multiple agents can be specified as a comma-delimited list, as demonstrated by
the default
value below.
-->
- <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent>
+ <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent>
<!-- Change this to "true" via the mvn command line or your
~/.m2/settings.xml to speed
up gwt compilation. -->
- <gwt.draftCompile>false</gwt.draftCompile>
+ <gwt.draftCompile>false</gwt.draftCompile>
<!-- Change this to "true" via the mvn command line or your
~/.m2/settings.xml to generate report -->
- <gwt.soyc>false</gwt.soyc>
+ <gwt.soyc>false</gwt.soyc>
<!-- Change this to "DETAILED" via the mvn command line or your
~/.m2/settings.xml to
make sure GWT-generated JavaScript code is not obfuscated. -->
- <gwt.style>PRETTY</gwt.style>
+ <gwt.style>PRETTY</gwt.style>
<!-- Comma-separated list of the locales that should be included during GWT
compilation. The specified locales
should each have two corresponding message bundle properties files under
src/main/resources/org/rhq/enterprise/gui/coregui/client/. For example, the
"ja" locale has
Messages_ja.properties and MessageConstants_ja.properties. -->
- <gwt.locale>en,de,ja,pt,zh,ru,cs</gwt.locale>
+ <gwt.locale>en,de,ja,pt,zh,ru,cs</gwt.locale>
<!-- The locale that GWT should fallback to if the user specified an
unsupported locale via the 'locale' query
string parameter. -->
- <gwt.fallback.locale>en</gwt.fallback.locale>
-
- <enable.tags>true</enable.tags>
- </properties>
+ <gwt.fallback.locale>en</gwt.fallback.locale>
+
+ <enable.tags>true</enable.tags>
+ </properties>
- <dependencies>
+ <dependencies>
<!-- ============= Internal Deps ============= -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
<!-- by rhq.ear (as ejb-jar) -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
<!-- by rhq.ear (as ejb-jar) -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-util</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
<!-- by rhq.ear -->
- </dependency>
+ </dependency>
<!-- =============== 3rd Party Deps =============== -->
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- This is so we can compile custom GWT Generators to be called during gwt
compilation.
Is is not needed at runtime and so is not included in the WAR. -->
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${gwt.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>com.smartgwt</groupId>
- <artifactId>smartgwt</artifactId>
- <version>${smartgwt.version}</version>
- </dependency>
+ <dependency>
+ <groupId>com.smartgwt</groupId>
+ <artifactId>smartgwt</artifactId>
+ <version>${smartgwt.version}</version>
+ </dependency>
<!-- the GWT graphing library (note, this provides jquery 1.3.2. If we get rid
of GFlot we will need
to provide jquery explcitly for jquery.sparkline support. See
CoreGUI.gwt.xml for the jquery.sparkline
declaration and coregui/webapp/js for the lib inclusion.) -->
- <dependency>
- <groupId>ca.nanometrics</groupId>
- <artifactId>gflot</artifactId>
- <version>1.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>ca.nanometrics</groupId>
+ <artifactId>gflot</artifactId>
+ <version>1.0.0</version>
+ </dependency>
<!-- for file uploads -->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
- <scope>provided</scope>
+ <scope>provided</scope>
<!-- by JBossAS itself, which the container buildNodes has packaged with
1.6.5 -->
- </dependency>
+ </dependency>
<!-- needed for referenced domain entities that use Hibernate annotations (due
to JDK5 bug) -->
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
- <scope>provided</scope>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
<!-- transitive dependency needed for JspC -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
<!-- needed for referenced domain entities that use JPA annotations (due to
JDK5 bug) -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
<!-- needed for EJB3 annotations (e.g. ApplicationException) -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
- <scope>provided</scope>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
<!-- Needed due to JDK 1.5 bug. -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
- <scope>provided</scope>
+ <scope>provided</scope>
<!-- by JBossAS -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- <version>3.0.1-native-2.0.4.GA</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <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-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <finalName>coregui</finalName>
+ <build>
+ <finalName>coregui</finalName>
- <resources>
- <resource>
-
<targetPath>${project.build.directory}/generated-sources/gwt</targetPath>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
+ <resources>
+ <resource>
+
<targetPath>${project.build.directory}/generated-sources/gwt</targetPath>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
<!--
Do NOT include java files here, because otherwise the java files from
resources would end up in WEB-INF/classes which definitely not
something
@@ -259,110 +260,110 @@
need to replace the ${...} place-holders with the build-provided
values
in there.
-->
- <includes>
- <include>**/*.gwt.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </resource>
- </resources>
-
-
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>2.4.0</version>
- <configuration>
- <noServer>true</noServer>
- <inplace>false</inplace>
+ <includes>
+ <include>**/*.gwt.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </resource>
+ </resources>
+
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>2.4.0</version>
+ <configuration>
+ <noServer>true</noServer>
+ <inplace>false</inplace>
<!-- <logLevel>INFO' -bindAddress 0.0.0.0 -logLevel
'INFO</logLevel> -->
- <logLevel>INFO</logLevel>
- <runTarget>${coreGuiRunTarget}</runTarget>
- <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs>
- <localWorkers>${gwt-plugin.localWorkers}</localWorkers>
- <draftCompile>${gwt.draftCompile}</draftCompile>
- <soyc>${gwt.soyc}</soyc>
-
<buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
- <hostedWebapp>target/hostedWar</hostedWebapp>
- <debugSuspend>false</debugSuspend>
- <servicePattern>**/gwt/*GWTService.java</servicePattern>
-
<i18nMessagesBundle>org.rhq.enterprise.gui.coregui.client.Messages</i18nMessagesBundle>
-
<i18nConstantsWithLookupBundle>org.rhq.enterprise.gui.coregui.client.MessageConstants</i18nConstantsWithLookupBundle>
-
<compileSourcesArtifact>org.rhq:rhq-core-domain</compileSourcesArtifact>
- <style>${gwt.style}</style>
- <strict>true</strict>
+ <logLevel>INFO</logLevel>
+ <runTarget>${coreGuiRunTarget}</runTarget>
+ <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs>
+ <localWorkers>${gwt-plugin.localWorkers}</localWorkers>
+ <draftCompile>${gwt.draftCompile}</draftCompile>
+ <soyc>${gwt.soyc}</soyc>
+ <buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
+ <hostedWebapp>target/hostedWar</hostedWebapp>
+ <debugSuspend>false</debugSuspend>
+ <servicePattern>**/gwt/*GWTService.java</servicePattern>
+
<i18nMessagesBundle>org.rhq.enterprise.gui.coregui.client.Messages</i18nMessagesBundle>
+
<i18nConstantsWithLookupBundle>org.rhq.enterprise.gui.coregui.client.MessageConstants</i18nConstantsWithLookupBundle>
+
<compileSourcesArtifact>org.rhq:rhq-core-domain</compileSourcesArtifact>
+ <style>${gwt.style}</style>
+ <strict>true</strict>
<!-- compiles gwt artifacts like symbolMap outside of war so it
doesnt get packaged -->
- <deploy>${project.build.directory}/gwt-deploy</deploy>
- </configuration>
-
- <executions>
- <execution>
- <id>gwt-goals</id>
- <goals>
- <goal>compile</goal>
- <goal>generateAsync</goal>
- <goal>i18n</goal>
- </goals>
- </execution>
- <execution>
+ <deploy>${project.build.directory}/gwt-deploy</deploy>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>gwt-goals</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>generateAsync</goal>
+ <goal>i18n</goal>
+ </goals>
+ </execution>
+ <execution>
<!-- This id is what does the trick, don't change it. For
this to work maven 2.2.0 and later is needed. -->
- <id>default-cli</id>
- <goals>
- <goal>debug</goal>
- </goals>
- <configuration>
-
<module>org.rhq.enterprise.gui.coregui.CoreGUI</module>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
- </archive>
- <webResources>
- <resource>
- <filtering>false</filtering>
-
<directory>${basedir}/src/main/webapp</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-gwt-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${basedir}/target/generated-sources/gwt</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <id>default-cli</id>
+ <goals>
+ <goal>debug</goal>
+ </goals>
+ <configuration>
+ <module>org.rhq.enterprise.gui.coregui.CoreGUI</module>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Build-Number>${buildNumber}</Build-Number>
+ </manifestEntries>
+ </archive>
+ <webResources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/webapp</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-gwt-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/gwt</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
<plugin>
@@ -406,36 +407,36 @@
</executions>
</plugin>
-->
- </plugins>
+ </plugins>
- </build>
+ </build>
- <profiles>
- <profile>
- <id>dev</id>
+ <profiles>
+ <profile>
+ <id>dev</id>
- <properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
-
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-
<rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName>
- <rhq.deploymentDir>
-
${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}
+ <properties>
+ <rhq.rootDir>../../../..</rhq.rootDir>
+
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+
<rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName>
+ <rhq.deploymentDir>
+
${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}
</rhq.deploymentDir>
- </properties>
+ </properties>
- <build>
- <plugins>
+ <build>
+ <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
- <execution>
- <id>deploy-classes</id>
- <phase>compile</phase>
- <configuration>
- <target>
+ <execution>
+ <id>deploy-classes</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
<!--
<property name="classes.dir"
location="${rhq.deploymentDir}/WEB-INF/classes" />
<echo>*** Copying updated files from
target/${project.buildNodes.finalName}/WEB-INF/classes to ${classes.dir}...</echo>
@@ -443,126 +444,126 @@
<fileset
dir="war/WEB-INF/classes" />
</copy>
-->
- <property name="deployment.dir"
location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from
-
src${file.separator}main${file.separator}webapp${file.separator} to
- ${deployment.dir}${file.separator}...
+ <property name="deployment.dir"
location="${rhq.deploymentDir}"/>
+ <echo>*** Copying updated files from
+ src${file.separator}main${file.separator}webapp${file.separator}
to
+ ${deployment.dir}${file.separator}...
</echo>
- <copy todir="${deployment.dir}"
verbose="${rhq.verbose}">
- <fileset
dir="${basedir}/src/main/webapp" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <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}...
+ <copy todir="${deployment.dir}"
verbose="${rhq.verbose}">
+ <fileset dir="${basedir}/src/main/webapp"/>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <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>
- </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}"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
+ <copy todir="${deployment.dir}"
verbose="${rhq.verbose}">
+ <fileset
dir="${basedir}/target/${project.build.finalName}"/>
+ </copy>
+ </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}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
<!-- Change the runTarget to not have single quotes. The quotes work for
linux but not win -->
- <profile>
- <id>windows</id>
- <activation>
- <os>
- <family>Windows</family>
- </os>
- </activation>
- <properties>
-
<coreGuiRunTarget>http://localhost:7080/coregui/CoreGUI.html${coreGuiParams}</coreGuiRunTarget>
- </properties>
- </profile>
-
- <profile>
- <id>msg</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <includes>
-
<include>org/rhq/enterprise/gui/coregui/client/Messages*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>disable-tags</id>
- <activation>
- <property>
- <name>brew</name>
- </property>
- </activation>
- <properties>
- <enable.tags>false</enable.tags>
- </properties>
- </profile>
-
- </profiles>
-
-
- <repositories>
- <repository>
- <id>smartgwt</id>
- <name>SmartGWT Releases</name>
- <
url>http://www.smartclient.com/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>codehaus</id>
- <name>Codehaus Releases</name>
- <
url>http://repository.codehaus.org/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- </repositories>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+
<coreGuiRunTarget>http://localhost:7080/coregui/CoreGUI.html${coreGuiParams}</coreGuiRunTarget>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>msg</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <includes>
+
<include>org/rhq/enterprise/gui/coregui/client/Messages*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>disable-tags</id>
+ <activation>
+ <property>
+ <name>brew</name>
+ </property>
+ </activation>
+ <properties>
+ <enable.tags>false</enable.tags>
+ </properties>
+ </profile>
+
+ </profiles>
+
+
+ <repositories>
+ <repository>
+ <id>smartgwt</id>
+ <name>SmartGWT Releases</name>
+ <
url>http://www.smartclient.com/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>codehaus</id>
+ <name>Codehaus Releases</name>
+ <
url>http://repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index bf10fc1..aa0aad3 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -1,95 +1,96 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <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>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
- <artifactId>rhq-enterprise-server</artifactId>
- <packaging>ejb</packaging>
+ <artifactId>rhq-enterprise-server</artifactId>
+ <packaging>ejb</packaging>
- <name>RHQ Enterprise Server JAR</name>
- <description>RHQ enterprise server main JAR</description>
+ <name>RHQ Enterprise Server JAR</name>
+ <description>RHQ enterprise server main JAR</description>
- <properties>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
+ <properties>
+ <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
+ <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
<!-- dependency versions -->
-
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
- <clean.db>true</clean.db>
- </properties>
+ <clean.db>true</clean.db>
+ </properties>
- <dependencies>
+ <dependencies>
<!-- Internal Deps -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-comm</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-xml-schemas</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by ear -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-dbutils</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>safe-invoker</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-common-drift</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.googlecode.java-diff-utils</groupId>
- <artifactId>diffutils</artifactId>
- <version>1.2.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-comm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server-xml-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope> <!-- by ear -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-dbutils</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>safe-invoker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-common-drift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.java-diff-utils</groupId>
+ <artifactId>diffutils</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<!--================ Test Deps ================-->
@@ -99,1103 +100,1114 @@
need the embeddable-ejb3 jar above the standard ejb3 jars because we need the
embeddble packages
loaded when testing. -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>perftest-support</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>perftest-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>jboss-ejb3-all</artifactId>
+ <version>${jboss-embeddable-ejb3.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- NOTE: The remaining test deps correspond to the classes contained in
hibernate-all.jar and thirdparty-all.jar. -->
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xercesImpl.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
<!-- 3rd Party Deps -->
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>3.2</version>
- </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>3.2</version>
+ </dependency>
<!-- Required by a couple APL and Lather classes - TODO: Remove this once APL
and Lather have been excised. -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
- </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.6.1</version>
+ </dependency>
<!-- Required by a couple APL classes - TODO: Remove this once APL has been
removed. -->
<!-- also required by EJB3 Embedded (test scope) -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
<!-- Required by a couple APL classes - TODO: Remove this once APL has been
removed. -->
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
- </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ </dependency>
<!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>gnu-getopt</groupId>
- <artifactId>getopt</artifactId>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1-jboss</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <dependency>
+ <groupId>hibernate-entitymanager</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- </dependency>
+ <dependency>
+ <groupId>i18nlog</groupId>
+ <artifactId>i18nlog</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
<!-- The Sun javamail jar isn't available from a public repo due to
licensing issues,
so use the Geronimo one instead. -->
- <version>1.3</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
+ <version>1.3</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-cache</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>compile</scope>
- </dependency>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
<!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the
PoolClass annotation used on some
of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx</artifactId>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>3.1.1</version>
+ </dependency>
<!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
+ <dependency>
+ <groupId>org.jboss.transaction</groupId>
+ <artifactId>jboss-jta</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
<!-- TODO: remove this - tests should all be moved under the test source tree
-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the
container build has packaged with 1.6.5 -->
- </dependency>
+ <scope>provided</scope> <!-- by JBossAS itself, which the container
build has packaged with 1.6.5 -->
+ </dependency>
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
+ <dependency>
+ <groupId>org.opensymphony.quartz</groupId>
+ <artifactId>quartz-oracle</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the
container build has packaged with 1.6.5 -->
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
+ <scope>provided</scope> <!-- by JBossAS itself, which the container
build has packaged with 1.6.5 -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
<!-- somehow this is needed otherwise the hibernate stuff doesn't
initialize in our tests -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>org.snmp4j</groupId>
- <artifactId>snmp4j</artifactId>
- <version>1.8.2</version>
- </dependency>
+ <dependency>
+ <groupId>org.snmp4j</groupId>
+ <artifactId>snmp4j</artifactId>
+ <version>1.8.2</version>
+ </dependency>
<!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
<!-- TODO: Why is this needed? -->
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
<!--<scope>test</scope>-->
- </dependency>
-
- <dependency>
- <groupId>rss4j</groupId>
- <artifactId>rss4j</artifactId>
- <version>0.92-on.2</version>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.5.20</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-jk</artifactId>
- <version>4.1.31</version>
- <scope>provided</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>rss4j</groupId>
+ <artifactId>rss4j</artifactId>
+ <version>0.92-on.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>5.5.20</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-jk</artifactId>
+ <version>4.1.31</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO:
Remove once APL has been excised. -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.29</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- <scope>provided</scope> <!-- by container -->
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>provided</scope> <!-- by container -->
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-links</artifactId>
- <version>${resteasy.version}</version>
- <scope>provided</scope> <!-- by container -->
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-yaml-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>provided</scope>
- <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>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-annotations_2.9.1</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>rest-docs-generator</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.1.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-testng</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-core</artifactId>
- <version>2.0.3</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <resources>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.5.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.29</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope> <!-- by container -->
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope> <!-- by container -->
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-links</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope> <!-- by container -->
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-yaml-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ <version>${resteasy.version}</version>
+ <scope>provided</scope>
+ <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>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-annotations_2.9.1</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rest-docs-generator</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <version>2.0.1.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.18</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ <version>2.0.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+
+ <resources>
<!-- Redefine which directories to treat like resources (which are filtered).
-->
- <resource>
- <directory>src/main/filtered-sources/java</directory>
- <filtering>true</filtering>
- <targetPath>../filtered-sources/java</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <generateClient>true</generateClient>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <target>
+ <resource>
+ <directory>src/main/filtered-sources/java</directory>
+ <filtering>true</filtering>
+ <targetPath>../filtered-sources/java</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <generateClient>true</generateClient>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
<!-- generate the I18N resource bundles -->
- <taskdef name="i18n"
classpathref="maven.runtime.classpath"
classname="mazz.i18n.ant.I18NAntTask" />
+ <taskdef name="i18n"
classpathref="maven.runtime.classpath"
classname="mazz.i18n.ant.I18NAntTask"/>
- <i18n outputdir="${project.build.outputDirectory}"
defaultlocale="en" verbose="false" append="false"
verify="true">
- <classpath refid="maven.runtime.classpath" />
- <classfileset
dir="${project.build.outputDirectory}">
- <include
name="**/ServerI18NResourceKeys.class" />
- <include name="**/AlertI18NResourceKeys.class"
/>
- </classfileset>
- </i18n>
+ <i18n outputdir="${project.build.outputDirectory}"
defaultlocale="en" verbose="false" append="false"
+ verify="true">
+ <classpath refid="maven.runtime.classpath"/>
+ <classfileset dir="${project.build.outputDirectory}">
+ <include name="**/ServerI18NResourceKeys.class"/>
+ <include name="**/AlertI18NResourceKeys.class"/>
+ </classfileset>
+ </i18n>
<!-- create our rhq-server-version.properties file that goes
in our jar -->
- <tstamp>
- <format property="build.time"
pattern="dd.MMM.yyyy HH.mm.ss z" />
- </tstamp>
-
- <echo
file="${project.build.outputDirectory}/rhq-server-version.properties"
append="false">Product-Name=${rhq.product.name}
-Product-Version=${project.version}
-Module-Name=${project.name}
-Module-Version=${project.version}
-Build-Number=${buildNumber}
-Build-Date=${build.time}
-Build-Jdk-Vendor=${java.vendor}
-Build-Jdk=${java.version}
-Build-OS-Name=${os.name}
-Build-OS-Version=${os.version}
+ <tstamp>
+ <format property="build.time" pattern="dd.MMM.yyyy
HH.mm.ss z"/>
+ </tstamp>
+
+ <echo
file="${project.build.outputDirectory}/rhq-server-version.properties"
append="false">Product-Name=${rhq.product.name}
+ Product-Version=${project.version}
+ Module-Name=${project.name}
+ Module-Version=${project.version}
+ Build-Number=${buildNumber}
+ Build-Date=${build.time}
+ Build-Jdk-Vendor=${java.vendor}
+ Build-Jdk=${java.version}
+ Build-OS-Name=${os.name}
+ Build-OS-Version=${os.version}
</echo>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
<!-- in order to get JMS to work properly in embedded test container,
extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <unzip src="src/test/resources/jms-ra.rar"
dest="target">
- <patternset>
- <include name="jms-ra.jar"/>
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar"
dest="target/test-classes">
- <patternset>
- <include name="org/**"/>
- </patternset>
- </unzip>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>Extract JMS classes from RAR needed for JMS tests</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
+ <unzip src="src/test/resources/jms-ra.rar"
dest="target">
+ <patternset>
+ <include name="jms-ra.jar"/>
+ </patternset>
+ </unzip>
+ <unzip src="target/jms-ra.jar"
dest="target/test-classes">
+ <patternset>
+ <include name="org/**"/>
+ </patternset>
+ </unzip>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<!-- Everything but the web service tests, this is the standard test
execution -->
- <configuration>
- <skipTests>true</skipTests>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <properties>
- <property>
- <name>listener</name>
- <value>org.rhq.test.testng.StdoutReporter</value>
- </property>
- </properties>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/classes</deploymentDirectory>
-
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- <log4j.configDebug>false</log4j.configDebug>
- </systemPropertyVariables>
- <additionalClasspathElements>
+ <configuration>
+ <skipTests>true</skipTests>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.rhq.test.testng.StdoutReporter</value>
+ </property>
+ </properties>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/classes</deploymentDirectory>
+
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ <log4j.configDebug>false</log4j.configDebug>
+ </systemPropertyVariables>
+ <additionalClasspathElements>
<!-- The below is required for tests to run against Oracle. -->
-
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
+
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+
+ <executions>
+
+ <execution>
+ <id>allExceptDbTests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <excludes>
+ <exclude>com/**/*.java</exclude>
+ <exclude>org/rhq/**/performance/**/*.java</exclude>
+ <exclude>org/rhq/enterprise/server/db/**</exclude>
+ </excludes>
</configuration>
-
- <executions>
-
- <execution>
- <id>allExceptDbTests</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <excludes>
- <exclude>com/**/*.java</exclude>
-
<exclude>org/rhq/**/performance/**/*.java</exclude>
-
<exclude>org/rhq/enterprise/server/db/**</exclude>
- </excludes>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>3.2</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>antlr</goal>
- </goals>
- <configuration>
- <conversionTimeout>30000</conversionTimeout>
- <debug>false</debug>
- <dfa>false</dfa>
- <nfa>false</nfa>
- <excludes>
-
- </excludes>
- <includes>
-
- </includes>
- <libDirectory>src/main/antlr3/imports</libDirectory>
- <messageFormat>antlr</messageFormat>
-
<outputDirectory>target/generated-sources/antlr3</outputDirectory>
- <printGrammar>false</printGrammar>
- <profile>false</profile>
- <report>false</report>
- <sourceDirectory>src/main/antlr3</sourceDirectory>
- <trace>false</trace>
- <verbose>true</verbose>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-filtered-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/filtered-sources/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-antlr-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${basedir}/target/generated-sources/antlr3</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>3.2</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>antlr</goal>
+ </goals>
+ <configuration>
+ <conversionTimeout>30000</conversionTimeout>
+ <debug>false</debug>
+ <dfa>false</dfa>
+ <nfa>false</nfa>
+ <excludes>
+
+ </excludes>
+ <includes>
+
+ </includes>
+ <libDirectory>src/main/antlr3/imports</libDirectory>
+ <messageFormat>antlr</messageFormat>
+
<outputDirectory>target/generated-sources/antlr3</outputDirectory>
+ <printGrammar>false</printGrammar>
+ <profile>false</profile>
+ <report>false</report>
+ <sourceDirectory>src/main/antlr3</sourceDirectory>
+ <trace>false</trace>
+ <verbose>true</verbose>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-filtered-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/filtered-sources/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-antlr-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/antlr3</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- Document generation from the Annotations on the REST-API. -->
<!-- TODO move to a better suited processing phase -->
- <plugin>
- <groupId>org.bsc.maven</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <version>2.0.6-redhat</version>
- <configuration>
- <processors>
-
<processor>org.rhq.helpers.rest_docs_generator.ClassLevelProcessor</processor>
- </processors>
-
<compilerArguments>-AtargetDirectory=${project.build.directory}/docs/xml</compilerArguments>
+ <plugin>
+ <groupId>org.bsc.maven</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <version>2.0.6-redhat</version>
+ <configuration>
+ <processors>
+
<processor>org.rhq.helpers.rest_docs_generator.ClassLevelProcessor</processor>
+ </processors>
+
<compilerArguments>-AtargetDirectory=${project.build.directory}/docs/xml</compilerArguments>
<!-- Comment the next line in to get more verbose output for debugging
-->
<!--<compilerArguments>-Averbose=true</compilerArguments>-->
- </configuration>
- <executions>
- <execution>
- <id>create-rest-api-reports</id>
- <phase>process-classes</phase>
- <goals>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-rest-api-reports</id>
+ <phase>process-classes</phase>
+ <goals>
<!-- We want to process the classes in src/ -->
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Disable annotation processors during normal compilation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-proc:none</compilerArgument>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <transformationSet>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgument>-proc:none</compilerArgument>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
<!-- org.rhq.helpers.rest_docs_generator.test plugin wrote to
target/docs/xml (see -AtargetDirectory above) -->
- <dir>target/docs/xml</dir>
-
<includes><include>rest-api-out.xml</include></includes>
- <stylesheet>src/main/xsl/apiout2html.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>basePath</name>
- <value>http://localhost:7080/rest/1</value>
- </parameter>
- </parameters>
- <outputDir>${project.build.directory}/docs/html</outputDir>
- <fileMappers>
- <fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
- <targetExtension>.html</targetExtension>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- <transformationSet>
+ <dir>target/docs/xml</dir>
+ <includes>
+ <include>rest-api-out.xml</include>
+ </includes>
+ <stylesheet>src/main/xsl/apiout2html.xsl</stylesheet>
+ <parameters>
+ <parameter>
+ <name>basePath</name>
+ <value>http://localhost:7080/rest/1</value>
+ </parameter>
+ </parameters>
+ <outputDir>${project.build.directory}/docs/html</outputDir>
+ <fileMappers>
+ <fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <targetExtension>.html</targetExtension>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ <transformationSet>
<!-- org.rhq.helpers.rest_docs_generator.test plugin wrote to
target/docs/xml (see -AtargetDirectory above) -->
- <dir>target/docs/xml</dir>
-
<includes><include>rest-api-out.xml</include></includes>
- <stylesheet>src/main/xsl/apiout2docbook.xsl</stylesheet>
- <parameters>
- <parameter>
- <name>basePath</name>
- <value>http://localhost:7080/rest/1</value>
- </parameter>
- </parameters>
- <outputDir>${project.build.directory}/docs/xml</outputDir>
- <fileMappers>
- <fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
- <targetExtension>.dbx.xml</targetExtension>
- </fileMapper>
- </fileMappers>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.9</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>generate-pdf</goal>
- <goal>generate-html</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sourceDirectory>target/docs/xml</sourceDirectory> <!-- from
previous plugin, 2nd transformation set -->
- <includes>rest-api-out.dbx.xml</includes>
- <hyphenate>false</hyphenate>
- <generateToc>true</generateToc>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
+ <dir>target/docs/xml</dir>
+ <includes>
+ <include>rest-api-out.xml</include>
+ </includes>
+ <stylesheet>src/main/xsl/apiout2docbook.xsl</stylesheet>
+ <parameters>
+ <parameter>
+ <name>basePath</name>
+ <value>http://localhost:7080/rest/1</value>
+ </parameter>
+ </parameters>
+ <outputDir>${project.build.directory}/docs/xml</outputDir>
+ <fileMappers>
+ <fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+ <targetExtension>.dbx.xml</targetExtension>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <version>2.0.9</version>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>generate-pdf</goal>
+ <goal>generate-html</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>target/docs/xml</sourceDirectory> <!-- from
previous plugin, 2nd transformation set -->
+ <includes>rest-api-out.dbx.xml</includes>
+ <hyphenate>false</hyphenate>
+ <generateToc>true</generateToc>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
<repositories>
<repository>
<!-- TODO change when the annotations are puplished. This is temporary for the
swagger annotations for REST-docu -->
- <id>sonatype-oss-snapshot</id>
- <name>Sonatype OSS Snapshot repository</name>
- <
url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <id>sonatype-oss-snapshot</id>
+ <name>Sonatype OSS Snapshot repository</name>
+ <
url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
- <profiles>
+ <profiles>
- <profile>
+ <profile>
<!-- only if we are not running an individual set of tests via -Dtest do we
do this -->
- <id>no-individual-test</id>
- <activation>
- <property><name>!test</name></property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <id>no-individual-test</id>
+ <activation>
+ <property>
+ <name>!test</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<!-- Everything but the web service tests, this is the standard test
execution -->
- <configuration>
- <skipTests>true</skipTests>
-
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <properties>
- <property>
- <name>listener</name>
- <value>org.rhq.test.testng.StdoutReporter</value>
- </property>
- </properties>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
-
<deploymentDirectory>target/classes</deploymentDirectory>
-
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- <log4j.configDebug>false</log4j.configDebug>
- </systemPropertyVariables>
- <additionalClasspathElements>
+ <configuration>
+ <skipTests>true</skipTests>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.rhq.test.testng.StdoutReporter</value>
+ </property>
+ </properties>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+ <deploymentDirectory>target/classes</deploymentDirectory>
+
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ <log4j.configDebug>false</log4j.configDebug>
+ </systemPropertyVariables>
+ <additionalClasspathElements>
<!-- The below is required for tests to run against Oracle.
-->
-
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- <executions>
- <execution>
- <id>dbTestsOnly</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <includes>
-
<include>org/rhq/enterprise/server/db/**</include>
- </includes>
- <failIfNoTests>false</failIfNoTests>
- </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}-ejb3.jar</rhq.deploymentName>
-
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>deploy</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <property name="deployment.dir"
location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from target/classes
to ${deployment.dir}...</echo>
- <copy todir="${deployment.dir}"
verbose="${rhq.verbose}">
- <fileset dir="target/classes" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ <executions>
+ <execution>
+ <id>dbTestsOnly</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <includes>
+ <include>org/rhq/enterprise/server/db/**</include>
+ </includes>
+ <failIfNoTests>false</failIfNoTests>
+ </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}-ejb3.jar</rhq.deploymentName>
+
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>deploy</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <property name="deployment.dir"
location="${rhq.deploymentDir}"/>
+ <echo>*** Copying updated files from target/classes to
${deployment.dir}...</echo>
+ <copy todir="${deployment.dir}"
verbose="${rhq.verbose}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
<!--
NOTE: The below execution is necessary to make sure the
META-INF/MANIFEST.MF and
META-INF/maven/** files, which get created by the ejb plugin
during the package phase, get
copied over to the deployment dir.
-->
- <execution>
- <id>deploy-jar-meta-inf</id>
- <phase>package</phase>
- <configuration>
- <target>
- <unjar
src="${project.build.directory}/${project.build.finalName}.jar"
dest="${rhq.deploymentDir}" overwrite="false">
- <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}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
+ <execution>
+ <id>deploy-jar-meta-inf</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <unjar
src="${project.build.directory}/${project.build.finalName}.jar"
dest="${rhq.deploymentDir}"
+ overwrite="false">
+ <patternset>
+ <include name="META-INF/**"/>
+ </patternset>
+ </unjar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- <!-- Add dependencies need for jdk5 builds. Remove when we stop supporting jdk5
-->
- <profile>
- <id>java-5-dependencies</id>
- <activation>
- <jdk>1.5</jdk>
- <property>
- <name>java5.home</name>
- </property>
- </activation>
+ <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>
- <dependencies>
- <dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Add dependencies need for jdk5 builds. Remove when we stop supporting jdk5
-->
+ <profile>
+ <id>java-5-dependencies</id>
+ <activation>
+ <jdk>1.5</jdk>
+ <property>
+ <name>java5.home</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
<!-- NOTE: This version is old but is good enough to resolve the build
dependency. -->
- <version>3.0.1-native-2.0.4.GA</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>javadoc.outputDirectory</name>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>remote-api</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <property name="javadoc.outputDirectory"
value="${javadoc.outputDirectory}" />
- <property name="project.dir"
value="./src/main/java/org/rhq/enterprise/server" />
- <property name="maven.compile.classpath"
refid="maven.compile.classpath" />
-
- <mkdir
dir="${javadoc.outputDirectory}/remote-api" />
- <javadoc
destdir="${javadoc.outputDirectory}/remote-api" author="false"
version="true" windowtitle="RHQ ${project.version} Remote API"
noindex="false">
- <classpath>
- <pathelement
path="${maven.compile.classpath}" />
- </classpath>
- <fileset dir="${project.dir}"
defaultexcludes="yes">
- <include name="**/*Remote.java" />
- </fileset>
- <link href="../domain/" />
- <link
href="http://download.oracle.com/javase/6/docs/api/" />
- <bottom><![CDATA[Copyright © 2005-2011
<a
href="http://redhat.com/">Red Hat, Inc.</a>. All Rights
Reserved.]]></bottom>
- </javadoc>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
- <profile>
- <id>cobertura</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+
<execution>
- <id>cobertura-instrument</id>
- <phase>process-test-classes</phase>
- <configuration>
- <target>
+ <id>remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <property name="javadoc.outputDirectory"
value="${javadoc.outputDirectory}"/>
+ <property name="project.dir"
value="./src/main/java/org/rhq/enterprise/server"/>
+ <property name="maven.compile.classpath"
refid="maven.compile.classpath"/>
+
+ <mkdir dir="${javadoc.outputDirectory}/remote-api"/>
+ <javadoc destdir="${javadoc.outputDirectory}/remote-api"
author="false" version="true"
+ windowtitle="RHQ ${project.version} Remote API"
noindex="false">
+ <classpath>
+ <pathelement path="${maven.compile.classpath}"/>
+ </classpath>
+ <fileset dir="${project.dir}"
defaultexcludes="yes">
+ <include name="**/*Remote.java"/>
+ </fileset>
+ <link href="../domain/"/>
+ <link
href="http://download.oracle.com/javase/6/docs/api/"/>
+ <bottom><![CDATA[Copyright © 2005-2011 <a
href="http://redhat.com/">Red Hat, Inc.</a>. All Rights
Reserved.]]></bottom>
+ </javadoc>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+ <profile>
+ <id>cobertura</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>${cobertura.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <target>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/cobertura/backup"/>
<!-- backup all classes so that we can instrument the original
classes-->
- <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
+ <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
<fileset dir="target/classes">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- create a properties file and save there location of cobertura
data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <touch file="target/classes/cobertura.properties"/>
+ <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- instrument all classes in target/classes directory -->
- <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
- <exclude
name="**/DynamicConfigurationPropertyLocal.class" />
- <exclude
name="**/DynamicConfigurationPropertyBean.class" />
+ <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ <exclude
name="**/DynamicConfigurationPropertyLocal.class"/>
+ <exclude
name="**/DynamicConfigurationPropertyBean.class"/>
</fileset>
</cobertura-instrument>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
<execution>
- <id>cobertura-report</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/site/cobertura"/>
<!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true"
overwrite="true">
+ <copy toDir="target/classes" verbose="true"
overwrite="true">
<fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
+ <delete dir="target/cobertura/backup"/>
<!-- create a code coverage report -->
- <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
destdir="${project.build.directory}/site/cobertura">
+ <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ destdir="${project.build.directory}/site/cobertura">
<fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
- </cobertura-report>
+ </cobertura-report>
<!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <delete file="target/classes/cobertura.properties"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml
b/modules/enterprise/server/xml-schemas/pom.xml
index 6923a7a..8e4bc21 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -1,82 +1,83 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-xml-schemas</artifactId>
- <packaging>jar</packaging>
+ <artifactId>rhq-parent</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server-xml-schemas</artifactId>
+ <packaging>jar</packaging>
- <name>RHQ Server XML Schemas</name>
- <description>Server side XML schemas and JAXB APIs used mailing to support the
RHQ Server plugin container</description>
+ <name>RHQ Server XML Schemas</name>
+ <description>Server side XML schemas and JAXB APIs used mailing to support the
RHQ Server plugin container</description>
- <dependencies>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- rhq.ear -->
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope> <!-- rhq.ear -->
+ </dependency>
- <dependency>
- <groupId>${rhq.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-client-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<!-- NOTE: The version is defined in the root POM's
dependencyManagement section. -->
<!--<scope>test</scope> not sure about this -->
- </dependency>
+ </dependency>
<!--
TODO: This is a fix for the Javac bug requiring annotations to be available
when compiling dependent
classes; it is fixed in JDK 6.
-->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>hibernate-all</artifactId>
- <version>1.0.0.Alpha9</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>hibernate-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
-
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
-
<schemaDirectory>${basedir}/target/classes</schemaDirectory>
- <includeSchemas>
- <includeSchema>*.xsd</includeSchema>
- </includeSchemas>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ <schemaDirectory>${basedir}/target/classes</schemaDirectory>
+ <includeSchemas>
+ <includeSchema>*.xsd</includeSchema>
+ </includeSchemas>
+ </configuration>
+ </plugin>
<!--
Because the JAXB generator needs all .xsd's available and in one
place so they can reference each other
@@ -90,211 +91,213 @@
we still have a duplicate copy of the .xsd in our jar, but this is OK
because it is a true duplicate
so it doesn't really matter that we have one copy here and one copy
in client-api jar.
-->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>Copy the schemas in one place, including
rhq-configuration.xsd schema so we can reuse it</id>
- <phase>initialize</phase>
- <configuration>
- <target>
- <mkdir dir="${basedir}/target/classes"
/>
- <copy todir="${basedir}/target/classes">
- <fileset
dir="${basedir}/src/main/resources">
- <include name="*.xsd" />
- </fileset>
- <fileset
dir="${basedir}/../../../core/client-api/src/main/resources">
- <include
name="rhq-configuration.xsd" />
- </fileset>
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>purge duplicated JAXB-generated configuration schema
classes</id>
- <phase>process-sources</phase>
- <configuration>
- <target>
- <delete
dir="${basedir}/target/generated-sources/xjc/org/rhq/core" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>Copy the schemas in one place, including rhq-configuration.xsd
schema so we can reuse it</id>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${basedir}/target/classes"/>
+ <copy todir="${basedir}/target/classes">
+ <fileset dir="${basedir}/src/main/resources">
+ <include name="*.xsd"/>
+ </fileset>
+ <fileset
dir="${basedir}/../../../core/client-api/src/main/resources">
+ <include name="rhq-configuration.xsd"/>
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>purge duplicated JAXB-generated configuration schema
classes</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <target>
+ <delete
dir="${basedir}/target/generated-sources/xjc/org/rhq/core"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-xjc-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${basedir}/target/generated-sources/xjc</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
+ <profiles>
- <profile>
- <id>dev</id>
+ <profile>
+ <id>dev</id>
- <properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
-
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir>
- </properties>
+ <properties>
+ <rhq.rootDir>../../../..</rhq.rootDir>
+
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir>
+ </properties>
- <build>
- <plugins>
+ <build>
+ <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
- <execution>
- <id>deploy</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <mkdir dir="${rhq.deploymentDir}"
/>
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating
${deployment.file}...</echo>
- <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>deploy</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${rhq.deploymentDir}"/>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating ${deployment.file}...</echo>
+ <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting
${deployment.file}...</echo>
- <delete file="${deployment.file}"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>undeploy</id>
+ <phase>clean</phase>
+ <configuration>
+ <target>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Deleting ${deployment.file}...</echo>
+ <delete file="${deployment.file}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>${cobertura.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
<execution>
- <id>cobertura-instrument</id>
- <phase>process-test-classes</phase>
- <configuration>
- <target>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <target>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/cobertura/backup"/>
<!-- backup all classes so that we can instrument the original
classes-->
- <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
+ <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
<fileset dir="target/classes">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- create a properties file and save there location of cobertura
data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <touch file="target/classes/cobertura.properties"/>
+ <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- instrument all classes in target/classes directory -->
- <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
+ <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
</fileset>
</cobertura-instrument>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
<execution>
- <id>cobertura-report</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/site/cobertura"/>
<!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true"
overwrite="true">
+ <copy toDir="target/classes" verbose="true"
overwrite="true">
<fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
+ <delete dir="target/cobertura/backup"/>
<!-- create a code coverage report -->
- <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
destdir="${project.build.directory}/site/cobertura">
+ <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ destdir="${project.build.directory}/site/cobertura">
<fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
- </cobertura-report>
+ </cobertura-report>
<!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <delete file="target/classes/cobertura.properties"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index e045081..9f93a29 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -1,291 +1,295 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-plugins-parent</artifactId>
+ <version>4.5.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-perftest-plugin</artifactId>
- <packaging>jar</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-perftest-plugin</artifactId>
+ <packaging>jar</packaging>
- <name>RHQ Performance Test Plugin</name>
- <description>a plugin for performance testing</description>
+ <name>RHQ Performance Test Plugin</name>
+ <description>a plugin for performance testing</description>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- </dependency>
+ </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+
<generatePackage>org.rhq.plugins.perftest.scenario</generatePackage>
+
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-jaxb-deps</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
<configuration>
-
<generatePackage>org.rhq.plugins.perftest.scenario</generatePackage>
-
<generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
</configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-jaxb-deps</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-xjc-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/generated-sources/xjc</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-xjc-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
<configuration>
- <skip>true</skip>
+ <sources>
+ <source>${basedir}/target/generated-sources/xjc</source>
+ </sources>
</configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
-
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Djava.library.path=${basedir}/target/itest/lib</argLine>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <useSystemClassLoader>false</useSystemClassLoader>
+
<argLine>-Djava.library.path=${basedir}/target/itest/lib</argLine>
<!--
<argLine>-Djava.library.path=${basedir}/target/itest/lib
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
- <systemPropertyVariables>
-
<project.artifactId>${project.artifactId}</project.artifactId>
-
<project.version>${project.version}</project.version>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <systemPropertyVariables>
+
<project.artifactId>${project.artifactId}</project.artifactId>
+ <project.version>${project.version}</project.version>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
- <profiles>
+ <profiles>
- <profile>
- <id>dev</id>
+ <profile>
+ <id>dev</id>
- <properties>
- <rhq.rootDir>../../..</rhq.rootDir>
-
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-downloads/rhq-plugins</rhq.deploymentDir>
- </properties>
+ <properties>
+ <rhq.rootDir>../../..</rhq.rootDir>
+
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
+
<rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-downloads/rhq-plugins</rhq.deploymentDir>
+ </properties>
- <build>
- <plugins>
+ <build>
+ <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
- <execution>
- <id>deploy</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <mkdir dir="${rhq.deploymentDir}" />
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}" update="true" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>deploy</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <mkdir dir="${rhq.deploymentDir}"/>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating ${deployment.file}...</echo>
+ <jar destfile="${deployment.file}"
basedir="${project.build.outputDirectory}" update="true"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- <execution>
- <id>deploy-jar-meta-inf</id>
- <phase>package</phase>
- <configuration>
- <target>
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Updating META-INF dir in
${deployment.file}...</echo>
- <unjar
src="${project.build.directory}/${project.build.finalName}.jar"
dest="${project.build.outputDirectory}">
- <patternset><include name="META-INF/**"
/></patternset>
- </unjar>
- <jar destfile="${deployment.file}"
manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
update="true">
- </jar>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>deploy-jar-meta-inf</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Updating META-INF dir in
${deployment.file}...</echo>
+ <unjar
src="${project.build.directory}/${project.build.finalName}.jar"
dest="${project.build.outputDirectory}">
+ <patternset>
+ <include name="META-INF/**"/>
+ </patternset>
+ </unjar>
+ <jar destfile="${deployment.file}"
manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
+ update="true">
+ </jar>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
- <echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <execution>
+ <id>undeploy</id>
+ <phase>clean</phase>
+ <configuration>
+ <target>
+ <property name="deployment.file"
location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <echo>*** Deleting ${deployment.file}...</echo>
+ <delete file="${deployment.file}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
- </executions>
- </plugin>
+ </executions>
+ </plugin>
- </plugins>
- </build>
- </profile>
+ </plugins>
+ </build>
+ </profile>
- <profile>
+ <profile>
<id>cobertura-plugins</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
- </dependencies>
- <executions>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>${cobertura.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
<execution>
- <id>cobertura-instrument</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <target>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/cobertura/backup" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/cobertura/backup"/>
<!-- backup all classes so that we can instrument the original
classes-->
- <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
+ <copy toDir="target/cobertura/backup"
verbose="true" overwrite="true">
<fileset dir="target/classes">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- create a properties file and save there location of cobertura
data file-->
- <touch file="target/classes/cobertura.properties" />
- <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <touch file="target/classes/cobertura.properties"/>
+ <echo
file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- instrument all classes in target/classes directory -->
- <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
todir="${project.build.directory}/classes">
- <fileset dir="${project.build.directory}/classes">
- <include name="**/*.class" />
+ <cobertura-instrument
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
</fileset>
</cobertura-instrument>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
<execution>
- <id>cobertura-report</id>
- <phase>post-integration-test</phase>
- <configuration>
- <target>
- <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties" />
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <target>
+ <taskdef classpathref="maven.plugin.classpath"
resource="tasks.properties"/>
<!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <mkdir dir="target/site/cobertura" />
+ <mkdir dir="target/cobertura"/>
+ <mkdir dir="target/site/cobertura"/>
<!-- restore classes from backup folder to classes folder -->
- <copy toDir="target/classes" verbose="true"
overwrite="true">
+ <copy toDir="target/classes" verbose="true"
overwrite="true">
<fileset dir="target/cobertura/backup">
- <include name="**/*.class" />
+ <include name="**/*.class"/>
</fileset>
- </copy>
+ </copy>
<!-- delete backup folder-->
- <delete dir="target/cobertura/backup" />
+ <delete dir="target/cobertura/backup"/>
<!-- create a code coverage report -->
- <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
destdir="${project.build.directory}/site/cobertura">
+ <cobertura-report format="html"
datafile="${project.build.directory}/cobertura/cobertura.ser"
+ destdir="${project.build.directory}/site/cobertura">
<fileset dir="${basedir}/src/main/java">
- <include name="**/*.java" />
+ <include name="**/*.java"/>
</fileset>
- </cobertura-report>
+ </cobertura-report>
<!-- delete cobertura.properties file -->
- <delete file="target/classes/cobertura.properties"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <delete file="target/classes/cobertura.properties"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>