modules/enterprise/server/ear/pom.xml
| 62 +-----
modules/enterprise/server/pom.xml
| 2
modules/enterprise/server/sars/pom.xml
| 1
modules/enterprise/server/sars/services-sar/pom.xml
| 97 ----------
modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
| 70 -------
5 files changed, 20 insertions(+), 212 deletions(-)
New commits:
commit e05abe75da0424192f5d516f896eedf0a4ffca1e
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Mon Jul 1 11:15:13 2013 +0200
Services SAR removed
diff --git a/modules/enterprise/server/ear/pom.xml
b/modules/enterprise/server/ear/pom.xml
index 9a82877..691d23c 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -82,13 +82,6 @@
</dependency>
<!-- ** SARs -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server-services-sar</artifactId>
- <version>${project.version}</version>
- <type>sar</type>
- </dependency>
-
<!--
<dependency>
<groupId>${project.groupId}</groupId>
@@ -271,13 +264,6 @@
<!-- The Maven ear plugin has a bug that causes SARs to be
marked as <connector> modules -->
<!-- and there is no way to tell it not to put the SAR in the
application.xml so we have -->
<!-- to do things with SARs separately using another maven
plugin below -->
- <sarModule>
- <groupId>${project.groupId}</groupId>
-
<artifactId>rhq-enterprise-server-services-sar</artifactId>
-
<bundleFileName>rhq-services.sar</bundleFileName>
- <excluded>true</excluded>
- </sarModule>
-
<!--
<sarModule>
<groupId>${project.groupId}</groupId>
@@ -348,35 +334,25 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <id>copy-sars</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
-
<artifactId>rhq-enterprise-server-services-sar</artifactId>
- <version>${project.version}</version>
- <type>sar</type>
- </artifactItem>
-
- <!--
- <artifactItem>
- <groupId>${project.groupId}</groupId>
-
<artifactId>rhq-enterprise-server-agent-sar</artifactId>
- <version>${project.version}</version>
- <type>sar</type>
- </artifactItem>
- -->
-
- </artifactItems>
-
<outputDirectory>${earDirectory}</outputDirectory>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
+ <!--<execution>-->
+ <!--<id>copy-sars</id>-->
+ <!--<phase>process-resources</phase>-->
+ <!--<goals>-->
+ <!--<goal>copy</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<artifactItems>-->
+ <!--<artifactItem>-->
+
<!--<groupId>${project.groupId}</groupId>-->
+
<!--<artifactId>rhq-enterprise-server-agent-sar</artifactId>-->
+
<!--<version>${project.version}</version>-->
+ <!--<type>sar</type>-->
+ <!--</artifactItem>-->
+ <!--</artifactItems>-->
+
<!--<outputDirectory>${earDirectory}</outputDirectory>-->
+ <!--<stripVersion>true</stripVersion>-->
+ <!--</configuration>-->
+ <!--</execution>-->
<execution>
<id>copy-core-agent-plugins</id>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 6ee3b70..725f18f 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -28,7 +28,7 @@
<module>server-metrics</module>
<module>data-migration</module>
<module>jar</module>
- <module>sars</module>
+ <!--<module>sars</module>-->
<module>plugins</module>
<module>ear</module>
<module>startup-subsystem</module>
diff --git a/modules/enterprise/server/sars/pom.xml
b/modules/enterprise/server/sars/pom.xml
index e9d63d5..1f3081e 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -33,7 +33,6 @@
<!--
<module>agent-sar</module>
-->
- <module>services-sar</module>
</modules>
<pluginRepositories>
diff --git a/modules/enterprise/server/sars/services-sar/pom.xml
b/modules/enterprise/server/sars/services-sar/pom.xml
deleted file mode 100644
index 0ffd88d..0000000
--- a/modules/enterprise/server/sars/services-sar/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.9.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-services-sar</artifactId>
- <packaging>jboss-sar</packaging>
-
- <name>RHQ Enterprise Server Internal Services SAR</name>
- <description>The SAR that provides the server with some necessary internal RHQ
services.</description>
-
- <properties>
-
<sarDirectory>${project.build.directory}/${project.build.finalName}</sarDirectory>
- </properties>
-
- <build>
- <finalName>rhq-enterprise-server-services-sar</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
- <profiles>
-
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../../../..</rhq.rootDir>
-
<rhq.containerDir>${rhq.rootDir}/${rhq.devContainerServerPath}</rhq.containerDir>
-
<rhq.deploymentName>${project.build.finalName}.sar</rhq.deploymentName>
-
<rhq.deploymentDir>${rhq.containerDir}/${rhq.earDeployDir}/${rhq.deploymentName}</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>deploy</id>
- <phase>package</phase>
- <configuration>
- <target>
- <property name="deployment.dir"
location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files
- from
-
target${file.separator}classes${file.separator}
- to
-
${deployment.dir}${file.separator}...</echo>
- <jar
destfile="${deployment.dir}">
- <fileset
dir="target/${project.build.finalName}" />
- </jar>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.dir"
location="${rhq.deploymentDir}" />
- <echo>*** Deleting
${deployment.dir}${file.separator}...</echo>
- <delete file="${deployment.dir}"
/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- </profile>
-
- </profiles>
-
-</project>
diff --git
a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
deleted file mode 100644
index c427db8..0000000
---
a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="urn:jboss:service:7.0"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
-
- <!--<mbean
code="org.rhq.enterprise.server.core.CustomJaasDeploymentService"-->
- <!--name="rhq:service=CustomJaasDeployment" />-->
-
- <!--<mbean code="org.rhq.enterprise.server.core.CoreServer"-->
- <!--name="rhq:service=CoreServer" />-->
-
- <!--<mbean
code="org.rhq.enterprise.server.measurement.instrumentation.MeasurementMonitor"-->
- <!--name="rhq:service=MeasurementMonitor" />-->
-
- <!--<mbean
code="org.rhq.enterprise.server.alert.engine.mbean.AlertConditionCacheMonitor"-->
- <!--name="rhq:service=AlertConditionCacheMonitor" />-->
-
- <!--<mbean
code="org.rhq.enterprise.server.resource.group.definition.mbean.GroupDefinitionRecalculationThreadMonitor"-->
- <!--name="rhq:service=GroupDefinitionRecalculationThreadMonitor"
/>-->
-
- <!--<mbean
code="org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner"-->
- <!--name="rhq:service=PluginDeploymentScanner">-->
- <!--<attribute
name="ScanPeriod">${rhq.server.plugin-scan-period-ms:300000}</attribute>-->
- <!--</mbean>-->
-
- <!--<mbean
code="org.rhq.enterprise.server.scheduler.SchedulerService"-->
- <!--name="rhq:service=scheduler">-->
- <!--<attribute name="QuartzProperties">-->
-<!--# RHQ custom property that defines the default timeout for all operations.-->
-<!--# This is specified in seconds. If any operation takes longer than this, it is
assumed to have failed.-->
-<!--rhq.server.operation-timeout = ${rhq.server.operation-timeout:600}-->
-
-<!--# scheduler factory config-->
-<!--org.quartz.scheduler.instanceName = RHQScheduler-->
-<!--org.quartz.scheduler.instanceId = AUTO-->
-
-<!--# thread pool config-->
-<!--org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool-->
-<!--org.quartz.threadPool.threadCount = 5-->
-
-<!--# database config-->
-<!--# note that the delegate class property should be set at build/installation
time-->
-<!--org.quartz.jobStore.class =
org.quartz.impl.jdbcjobstore.JobStoreCMT-->
-<!--org.quartz.jobStore.driverDelegateClass =
${rhq.server.quartz.driverDelegateClass}-->
-<!--org.quartz.jobStore.isClustered = true-->
-<!--org.quartz.jobStore.clusterCheckinInterval = 30000-->
-<!--org.quartz.jobStore.tablePrefix = RHQ_QRTZ_-->
-<!--org.quartz.jobStore.useProperties = true-->
-<!--org.quartz.jobStore.selectWithLockSQL =
${rhq.server.quartz.selectWithLockSQL}-->
-<!--org.quartz.jobStore.dataSource = RHQDS-->
-<!--org.quartz.dataSource.RHQDS.jndiURL =
java:jboss/datasources/RHQDS-->
-<!--org.quartz.dataSource.RHQDS.maxConnections = 10-->
-<!--org.quartz.jobStore.nonManagedTXDataSource = NoTxRHQDS-->
-<!--org.quartz.dataSource.NoTxRHQDS.jndiURL =
java:jboss/datasources/NoTxRHQDS-->
-<!--org.quartz.dataSource.NoTxRHQDS.maxConnections = 10-->
-<!--org.quartz.jobStore.lockHandler.class =
${rhq.server.quartz.lockHandlerClass}-->
- <!--</attribute>-->
- <!--</mbean>-->
-
- <!--<mbean
code="org.rhq.enterprise.server.core.comm.ServerCommunicationsService"-->
- <!--name="rhq:service=ServerCommunications" />-->
-
- <!--<mbean
code="org.rhq.enterprise.server.plugin.pc.ServerPluginService"-->
- <!--name="rhq:service=ServerPluginService" />-->
-
- <!-- TODO: first, see if we need this and if so we need to refactor this to work
inside AS7
- <mbean
code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
-
name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller"
/>
- -->
-</server>