[rhq] modules/plugins
by snegrea
modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml | 18 +++++-----
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit d891b56fa5275ed36d1e7be303d2aa98f5150f3f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 14:38:59 2012 -0500
[BZ 803737] - Update the ignore rules for AS7 plugin to use path expressions for class names.
diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
index 13e6809..c857b44 100644
--- a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
+++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
@@ -1,49 +1,49 @@
<differences>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/BaseServerComponent</className>
<differenceType>7011</differenceType>
<method>java.lang.String getBaseDirAttributeName()</method>
<justification>Functionality enhancements</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/BaseServerComponent</className>
<differenceType>7004</differenceType>
<method>boolean waitUntilDown(org.rhq.core.pluginapi.operation.OperationResult)</method>
<justification>Functionality enhancements</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.helper.HostConfiguration</className>
+ <className>org/rhq/modules/plugins/jbossas7/helper/HostConfiguration</className>
<differenceType>7002</differenceType>
<method>org.rhq.modules.plugins.jbossas7.helper.HostPort getHostPort(org.rhq.modules.plugins.jbossas7.AS7CommandLine)</method>
<justification>Method no longer needed</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnCContainerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnCContainerComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnCacheComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnCacheComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.ThreadPoolComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/ThreadPoolComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.ThreadsComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/ThreadsComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.WebservicesComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/WebservicesComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec500336618081a28241d9203583f1ef8d3adb24
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 14:42:35 2012 -0400
fixes BZ 860807
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index 8b26cb2..f4066f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -453,7 +453,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
this.operationParameters = (defaultTemplate != null) ? defaultTemplate.createConfiguration()
: new Configuration();
} else {
-
+ this.operationParameters = new Configuration();
}
ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
11 years, 7 months
- 1
- 0
[rhq] 2 commits - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 83d01eaf0eecc246bb519497376706dad0dd978b
Merge: 623736e 463e7a7
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 14:40:46 2012 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 623736eb9931fae27d9c305ca9dd7c722e27c698
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 14:40:30 2012 -0400
[BZ 860807] have the else statement actually do something
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index 8b26cb2..f4066f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -453,7 +453,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
this.operationParameters = (defaultTemplate != null) ? defaultTemplate.createConfiguration()
: new Configuration();
} else {
-
+ this.operationParameters = new Configuration();
}
ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise
by Jay Shaughnessy
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 2
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 33 ++++++----
4 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit 4b56ed9cc3fafecf2c8e7b0b5491e5c35c5ccf37
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Sep 26 14:38:01 2012 -0400
Fix issues in the RemoteSafeInvoker for remote clients
- fix JNDI lookups given new JNDI naming for AS7
- this required sending the in fqcn of the remote from the client, which
we previously did not do. Remote clients will need to run on compatible
CLI/version.
- do a better job of validating whether we are invoking a valid remote method
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
index af434d2..199dd5c 100644
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -108,7 +107,7 @@ public class RemoteClient implements RhqFacade {
public <T> T remoteInvoke(RhqManager manager, Method method, Class<T> expectedReturnType, Object... parameters)
throws Throwable {
- String methodSig = manager.beanName() + ":" + method.getName();
+ String methodSig = manager.remote().getName() + ":" + method.getName();
Class<?>[] paramTypes = method.getParameterTypes();
String[] paramSig = new String[paramTypes.length];
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java
index 8d5ca9a..3a435ef 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java
@@ -44,9 +44,7 @@ import org.rhq.enterprise.server.safeinvoker.HibernateDetachUtility;
* Although, we execute only locals to bypass the serialization performed by a remote invocation. Even
* though this handler is co-located, for remotes, remoting will serialize the return data immediately.
* This is bad for us because since we return domain objects we ned to scrub the data, removing
- * hibernate proxies (see {@link HibernateDetachUtility}. Additionally, we set our serialization
- * strategy for REMOTEAPI, indicating to classes implementing Externalizable that we need to serialize
- * all data expected by the remote api (as opposed to say, thin versions for agent-server comm).
+ * hibernate proxies (see {@link HibernateDetachUtility}.
*
* @author Greg Hinkle
* @autor Jay Shaughnessy
@@ -91,12 +89,7 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler {
methodName = nbi.getMethodName();
String[] methodInfo = methodName.split(":");
-
- // Lookup the remote first, if it doesn't exist exit with error.
- // This prevents remote clients from accessing the locals.
- String jndiName = "rhq/" + methodInfo[0];
- Object target = ic.lookup(jndiName + "/remote");
- target = ic.lookup(jndiName + "/local");
+ Class<?> remoteClass = getClass(methodInfo[0]);
String[] signature = nbi.getSignature();
int signatureLength = signature.length;
@@ -105,9 +98,19 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler {
sig[i] = getClass(signature[i]);
}
+ // make sure the remote method is defined to ensure remote clients don't access locals
+ String jndiName = getRemoteJNDIName(remoteClass);
+ Object target = ic.lookup(jndiName);
Method m = target.getClass().getMethod(methodInfo[1], sig);
+
+ // switch to the local
+ jndiName = getLocalJNDIName(remoteClass);
+ target = ic.lookup(jndiName);
+
+ m = target.getClass().getMethod(methodInfo[1], sig);
result = m.invoke(target, nbi.getParameters());
successful = true;
+
} catch (InvocationTargetException e) {
log.error("Failed to invoke remote request", e);
return new WrappedRemotingException(e.getTargetException());
@@ -142,7 +145,17 @@ public class RemoteSafeInvocationHandler implements ServerInvocationHandler {
return result;
}
- Class<?> getClass(String name) throws ClassNotFoundException {
+ private static <T> String getLocalJNDIName(Class<?> remoteClass) {
+ return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean")
+ + "!" + remoteClass.getName().replace("Remote", "Local"));
+ }
+
+ private static <T> String getRemoteJNDIName(Class<?> remoteClass) {
+ return ("java:global/rhq/rhq-enterprise-server-ejb3/" + remoteClass.getSimpleName().replace("Remote", "Bean")
+ + "!" + remoteClass.getName());
+ }
+
+ private static Class<?> getClass(String name) throws ClassNotFoundException {
// TODO GH: Doesn't support arrays
if (PRIMITIVE_CLASSES.containsKey(name)) {
return PRIMITIVE_CLASSES.get(name);
commit e8efcfccd5a468269224d02325db0d5da8c1568b
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Sep 26 14:35:24 2012 -0400
Make sure CLI now has jboss-logging jar
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index f8a481e..04c270a 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -120,7 +120,7 @@
<property name="getopt.version" value="${getopt.version}" />
<property name="i18nlog.version" value="${i18nlog.version}" />
<property name="jboss-common-core.version" value="${jboss-common-core.version}" />
- <property name="jboss.version" value="${jboss.version}" />
+ <property name="jboss-logging.version" value="${jboss-logging.version}" />
<property name="jboss-remoting.version" value="${jboss-remoting.version}" />
<property name="jboss-javassist.version" value="${javassist.version}" />
<property name="jline.version" value="${jline.version}" />
diff --git a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
index 83adf26..03166a1 100644
--- a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
+++ b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
@@ -6,7 +6,6 @@
<property name="bin.home" location="${output.dir}/bin" />
<property name="cli.home" location="${output.dir}/cli" />
<property name="conf.home" location="${output.dir}/conf" />
- <property name="jboss.home" location="${basedir}/target/jboss-${jboss.version}" />
<property name="lib.home" location="${output.dir}/lib" />
<property name="samples.home" location="${output.dir}/samples"/>
@@ -58,6 +57,7 @@
<copy file="${settings.localRepository}/org/rhq/rhq-enterprise-server/${project.version}/rhq-enterprise-server-${project.version}-client.jar" tofile="${lib.home}/rhq-enterprise-server-${project.version}-client.jar" verbose="true" />
<copy file="${settings.localRepository}/org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" tofile="${lib.home}/rhq-enterprise-comm-${project.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/org/jboss/jboss-common-core/${jboss-common-core.version}/jboss-common-core-${jboss-common-core.version}.jar" tofile="${lib.home}/jboss-common-core-${jboss-common-core.version}.jar" verbose="true" />
+ <copy file="${settings.localRepository}/org/jboss/logging/jboss-logging/${jboss-logging.version}/jboss-logging-${jboss-logging.version}.jar" tofile="${lib.home}/jboss-logging-${jboss-logging.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/jboss/jboss-remoting/${jboss-remoting.version}/jboss-remoting-${jboss-remoting.version}.jar" tofile="${lib.home}/jboss-remoting-${jboss-remoting.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/org/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar" tofile="${lib.home}/javassist-${jboss-javassist.version}.jar" verbose="true" />
<copy file="${settings.localRepository}/oswego-concurrent/concurrent/${concurrent.version}/concurrent-${concurrent.version}.jar" tofile="${lib.home}/concurrent-${concurrent.version}.jar" verbose="true" />
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/gui/installer/pom.xml | 2 +-
modules/enterprise/server/appserver/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1f29c567a0aad5e0aa1afd79be88ae481c66f99f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 12:39:18 2012 -0400
increment pom version
diff --git a/modules/enterprise/gui/installer/pom.xml b/modules/enterprise/gui/installer/pom.xml
index 3b46bab..93e3f79 100644
--- a/modules/enterprise/gui/installer/pom.xml
+++ b/modules/enterprise/gui/installer/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml
index 416526c..8d8ba6a 100644
--- a/modules/enterprise/server/appserver/pom.xml
+++ b/modules/enterprise/server/appserver/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
11 years, 7 months
- 1
- 0
[rhq] modules/plugins
by snegrea
modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml | 50 ++++++++++
1 file changed, 50 insertions(+)
New commits:
commit 463e7a7994b95b9533891960a9d4a0e5dc46a2aa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 11:24:39 2012 -0500
[BZ 803737] - Adding the ignore rules for intentional API changes in AS7 plugin.
diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..13e6809
--- /dev/null
+++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,50 @@
+<differences>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <differenceType>7011</differenceType>
+ <method>java.lang.String getBaseDirAttributeName()</method>
+ <justification>Functionality enhancements</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <differenceType>7004</differenceType>
+ <method>boolean waitUntilDown(org.rhq.core.pluginapi.operation.OperationResult)</method>
+ <justification>Functionality enhancements</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.helper.HostConfiguration</className>
+ <differenceType>7002</differenceType>
+ <method>org.rhq.modules.plugins.jbossas7.helper.HostPort getHostPort(org.rhq.modules.plugins.jbossas7.AS7CommandLine)</method>
+ <justification>Method no longer needed</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnCContainerComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnCacheComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.ThreadPoolComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.ThreadsComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.WebservicesComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+</differences>
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 3 commits - modules/enterprise .settings/org.eclipse.core.resources.prefs
by Jay Shaughnessy
.settings/org.eclipse.core.resources.prefs | 36
dev/null |binary
modules/enterprise/gui/installer-war/pom.xml | 359 -
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/AutoInstallServlet.java | 64
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 1114 ----
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/LoggerAntBuildListener.java | 102
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java | 225
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItemWithValue.java | 87
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 1324 ----
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 491 -
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/StartPageResults.java | 23
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java | 703 --
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_de.properties | 82
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_fr.properties | 47
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties | 157
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties | 66
modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties | 158
modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties | 9
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml | 66
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/jboss-web.xml | 5
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/web.xml | 63
modules/enterprise/gui/installer-war/src/main/webapp/createdb.jsp | 48
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 108
modules/enterprise/gui/installer-war/src/main/webapp/index.html | 49
modules/enterprise/gui/installer-war/src/main/webapp/invalid_database.jsp | 28
modules/enterprise/gui/installer-war/src/main/webapp/save_error.jsp | 32
modules/enterprise/gui/installer-war/src/main/webapp/start.jsp | 352 -
modules/enterprise/gui/installer-war/src/main/webapp/style.css | 32
modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp | 70
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 208
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.4.0.xml | 669 --
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml | 690 --
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml | 396 -
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml | 398 -
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.4.0.xml | 2494 ---------
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml | 2649 ----------
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml | 2642 ---------
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml | 2649 ----------
modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 417 -
modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/bundles.js | 150
modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/drift.js | 240
modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/jbossas.js | 811 +++
modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/util.js | 280 +
modules/enterprise/server/container/pom.xml | 443 -
modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.bat | 121
modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh | 160
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server-console.bat | 2
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.bat | 223
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.security-policy | 10
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 491 -
modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 201
modules/enterprise/server/container/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc | 16
modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 73
modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt | 22
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js | 150
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js | 240
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js | 811 ---
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js | 280 -
modules/enterprise/server/container/src/main/resources/alert-scripts/README.txt | 2
modules/enterprise/server/container/src/main/resources/alert-scripts/example.rb | 16
modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 135
modules/enterprise/server/container/src/main/resources/jbossas/bin/run.bat | 128
modules/enterprise/server/container/src/main/resources/jbossas/bin/run.conf | 47
modules/enterprise/server/container/src/main/resources/jbossas/bin/run.sh | 258
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 476 -
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml | 700 --
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jbossjta-properties.xml | 247
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/logging.properties | 77
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml | 78
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cache-invalidation-service.xml | 48
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cluster-service.xml | 247
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb-deployer.xml | 309 -
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3-entity-cache-service.xml | 72
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml | 312 -
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/persistence.properties | 20
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/web.xml | 13
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/index.html | 49
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/conf/web.xml | 1251 ----
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/context.xml | 17
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/server.xml | 228
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jms-h2.rej/rhq-jdbc2-service.xml | 72
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml | 107
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/mail-service.xml | 41
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml | 173
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.h2.rej | 44
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.oracle.rej | 60
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.postgres.rej | 42
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.sqlserver.rej | 58
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml | 40
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/jboss-web.xml | 5
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/web.xml | 20
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html | 17
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf | 13
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 13
modules/enterprise/server/container/src/main/resources/plugins/README.txt | 7
modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 39
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 850 ---
modules/enterprise/server/container/src/main/shell/zip_all_plugins | 4
98 files changed, 1501 insertions(+), 28670 deletions(-)
New commits:
commit 988f31a3d26da7de1be929f27dd3188704e0a039
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Sep 26 11:26:09 2012 -0400
-Remove the obsolete "container" module, it is replaced with "appserver".
-Remove the obsolete "installer-war" module, it is replaced with "installer".
By removing these we'll more easily flag changes in master when we merge it
into the rhq-on-as7 branch, and then merge the changes into the new modules.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index a1002e9..b91ecb2 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,19 +1,17 @@
-#Mon Jun 06 11:45:23 EDT 2011
-eclipse.preferences.version=1
-encoding//modules/core/dbutils/src/main/java/org/rhq/core/db/DbUtilsI18NResourceKeys.java=UTF-8
-encoding//modules/core/util/src/main/java/org/rhq/core/util/UtilI18NResourceKeys.java=UTF-8
-encoding//modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java=UTF-8
-encoding//modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties=UTF-8
-encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties=UTF-8
-encoding//modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java=ISO-8859-1
-encoding//modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/MeasurementI18NResourceKeys.java=ISO-8859-1
-encoding//modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerI18NFactory.java=UTF-8
-encoding//modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerI18NResourceKeys.java=UTF-8
+eclipse.preferences.version=1
+encoding//modules/core/dbutils/src/main/java/org/rhq/core/db/DbUtilsI18NResourceKeys.java=UTF-8
+encoding//modules/core/util/src/main/java/org/rhq/core/util/UtilI18NResourceKeys.java=UTF-8
+encoding//modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java=UTF-8
+encoding//modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties=UTF-8
+encoding//modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties=UTF-8
+encoding//modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/MeasurementI18NResourceKeys.java=ISO-8859-1
+encoding//modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerI18NFactory.java=UTF-8
+encoding//modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerI18NResourceKeys.java=UTF-8
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
deleted file mode 100644
index 5999c19..0000000
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ /dev/null
@@ -1,359 +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-parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>rhq-installer</artifactId>
- <packaging>war</packaging>
-
- <name>RHQ Enterprise Installer War</name>
- <description>The RHQ Enterprise Installer webapp</description>
-
- <properties>
- <war.dir>${basedir}/target/${final.name}</war.dir>
-
- <!-- plugin versions -->
- <jetty-jspc-maven-plugin.version>7.0.1.v20091125</jetty-jspc-maven-plugin.version>
-
- <product.shortName>RHQ</product.shortName>
- <product.name>RHQ</product.name>
- <product.fullName>RHQ</product.fullName>
- <product.url.domain>jboss.org</product.url.domain>
- <product.sales.email>rhq-users(a)lists.fedorahosted.org</product.sales.email>
- <product.support.email>rhq-users(a)lists.fedorahosted.org</product.support.email>
- <product.version>${project.version}</product.version>
- <product.help.doc.root>https://docs.jboss.org/author/display/RHQ/</product.help.doc.root>
- <product.help.installation>Installation</product.help.installation>
- <product.help.guide.server>Running+the+RHQ+Server</product.help.guide.server>
- <product.help.guide.agent>Running+the+RHQ+Agent</product.help.guide.agent>
- <product.help.FAQ>FAQ</product.help.FAQ>
- <product.help.config.props>https://docs.jboss.org/author/display/RHQ/Startup+Properties#StartupPrope...</product.help.config.props>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-dbutils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <!-- need this solely for SecurityUtils -->
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-comm</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
- </dependency>
-
- <dependency>
- <groupId>i18nlog</groupId>
- <artifactId>i18nlog</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>${jboss.version}</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx</artifactId>
- <version>4.2.3.GA</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss.jbossas.core-libs</groupId>
- <artifactId>jboss-jca</artifactId>
- <version>4.2.2.GA</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.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- NOTE: The below dep is needed so that the Jetty JSP compiler can find the JSF tld files. -->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>rhq-installer</finalName>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping>
- <rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name>
- <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name>
- <rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url>
- <rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username>
- <rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password>
- <rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name>
- <rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <filtering>true</filtering>
- <directory>${basedir}/src/main/webapp</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>${basedir}/target/resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>Generate I18N Resource Bundles</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <!-- generate the I18N resource bundles -->
- <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">-->
- <i18n outputdir="${basedir}/target/resources/WEB-INF/classes" defaultlocale="en" verbose="${i18nlog.verbose}" append="false" verify="true">
- <classpath refid="maven.runtime.classpath" />
- <classfileset dir="${project.build.outputDirectory}">
- <include name="**/*I18NResourceKeys.class" />
- </classfileset>
- </i18n>
- <copy todir="${project.build.outputDirectory}" encoding="${project.build.sourceEncoding}" outputencoding="${project.build.sourceEncoding}">
- <fileset dir="${basedir}/target/resources/WEB-INF/classes">
- <include name="InstallerMessages*.properties" />
- </fileset>
- <mapper type="glob" from="*" to="*.unfiltered" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-
- <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/standalone/deployments/${rhq.deploymentName}</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <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/classes to ${classes.dir}...</echo>
- <copy todir="${classes.dir}" verbose="${rhq.verbose}">
- <fileset dir="target/classes" />
- </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>
- <delete dir="${deployment.dir}.rej" /> <!-- need to remove any residual backups -->
- </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>
-
- <profile>
- <id>dist</id>
-
- <build>
- <plugins>
- <plugin>
- <!-- See http://jetty.mortbay.org/jspc-maven-plugin/ -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-jspc-maven-plugin</artifactId>
- <version>${jetty-jspc-maven-plugin.version}</version>
- <configuration>
- <keepSources>false</keepSources>
- <validateXml>false</validateXml>
- <generatedClasses>${project.build.outputDirectory}</generatedClasses>
- </configuration>
- <executions>
- <execution><goals><goal>jspc</goal></goals></execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>oracle</id>
- <activation>
- <property>
- <name>rhq.test.db.type</name>
- <value>oracle</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/DBInstallatonTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/AutoInstallServlet.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/AutoInstallServlet.java
deleted file mode 100644
index 27228d3..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/AutoInstallServlet.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.util.Properties;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
-/**
- * This checks to see if the server is already preconfigured. If it is, it kicks off an auto-install,
- * thus allowing the server to complete its installation without human intervention.
- *
- * This assumes rhq-server.properties is already preconfigured.
- *
- * @author John Mazzitelli
- */
-public class AutoInstallServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void init() throws ServletException {
- ServerInformation serverInfo = new ServerInformation();
- Properties serverProperties = serverInfo.getServerProperties();
- String enabledString = serverProperties.getProperty(ServerProperties.PROP_AUTOINSTALL_ENABLE);
- boolean enabled = Boolean.parseBoolean(enabledString);
- if (enabled) {
- log("Server is preconfigured - performing auto-install immediately...");
- try {
- // this server has been preconfigured. We need to run through the auto-installation now
- ConfigurationBean configBean = new ConfigurationBean();
- configBean.setHaServerFromPropertiesOnly();
- StartPageResults results = configBean.save();
- if (results != StartPageResults.SUCCESS) {
- throw new Exception("Save failed - check logs for error messages");
- }
- } catch (Throwable t) {
- log("The server was preconfigured but it failed to auto-install!", t);
- throw new ServletException(t);
- }
- log("Server has been auto-installed and should be ready shortly.");
- } else {
- log("Server is not preconfigured - will not perform auto-install. Please perform a manual install.");
- }
-
- return;
- }
-}
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
deleted file mode 100644
index e06dbe8..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-
-import mazz.i18n.Msg;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jboss.resource.security.SecureIdentityLoginModule;
-
-import org.rhq.core.db.DatabaseTypeFactory;
-import org.rhq.core.util.exception.ThrowableUtil;
-import org.rhq.enterprise.installer.i18n.InstallerI18NResourceKeys;
-
-/**
- * Responsible for taking the settings the user selects in the installer window and saves them
- * as the server's initial configuration.
- *
- * @author John Mazzitelli
- * @author Jay Shaughnessy
- */
-public class ConfigurationBean {
- private static final Log LOG = LogFactory.getLog(ConfigurationBean.class);
-
- private static Set<String> JON_SUPPORTED_DATABASE_TYPES = new HashSet<String>(2);
- static {
- JON_SUPPORTED_DATABASE_TYPES.add("PostgreSQL");
- JON_SUPPORTED_DATABASE_TYPES.add("Oracle");
- }
-
- private enum ExistingSchemaOption {
- OVERWRITE, KEEP, SKIP
- };
-
- private Msg I18Nmsg;
- private List<SelectItem> existingSchemaOptions;
- private ServerInformation serverInfo;
- private Boolean showAdvancedSettings;
- private List<PropertyItemWithValue> configuration;
- private String lastError;
- private String lastTest;
- private String lastCreate;
- private String existingSchemaOption;
- private String adminConnectionUrl;
- private String adminUsername;
- private String adminPassword;
- private ServerInformation.Server haServer;
- private String haServerName;
- private String selectedRegisteredServerName;
-
- public ConfigurationBean() {
- FacesContext currentInstance = FacesContext.getCurrentInstance();
- if (currentInstance != null) {
- I18Nmsg = new Msg(InstallerI18NResourceKeys.BUNDLE_BASE_NAME, currentInstance.getViewRoot().getLocale());
- } else {
- I18Nmsg = new Msg(InstallerI18NResourceKeys.BUNDLE_BASE_NAME, Locale.getDefault());
- }
- serverInfo = new ServerInformation();
- showAdvancedSettings = Boolean.FALSE;
- existingSchemaOption = ExistingSchemaOption.KEEP.name();
- // this will initialize 'configuration'
- initConfiguration();
-
- if (!isAutoinstallEnabled()) {
- setHaServerName(getDefaultServerName());
- }
- }
-
- private String getDefaultServerName() {
- String defaultServerName = "";
-
- try {
- defaultServerName = InetAddress.getLocalHost().getCanonicalHostName();
- } catch (Exception e) {
- LOG.info("Could not determine default server name: ", e);
- }
-
- return defaultServerName;
- }
-
- /**
- * Loads in the server's current configuration and returns all the settings.
- * This only returns the property if it is a basic setting or the UI is showing advanced, too.
- *
- * @return the requested server setting
- */
- public PropertyItemWithValue getConfigurationProperty(String propertyName) {
- return getConfigurationProperty(getConfiguration(), propertyName);
- }
-
- /**
- * Loads in the server's current configuration and returns all the settings.
- * This returns any property, basic or advanced, no matter what the "show advanced" setting is.
- *
- * @return the requested server setting
- */
- private PropertyItemWithValue getConfigurationPropertyFromAll(String propertyName) {
- return getConfigurationProperty(this.configuration, propertyName);
- }
-
- private PropertyItemWithValue getConfigurationProperty(List<PropertyItemWithValue> config, String propertyName) {
- PropertyItemWithValue result = null;
-
- for (PropertyItemWithValue item : config) {
- if (item.getItemDefinition().getPropertyName().equalsIgnoreCase(propertyName)) {
- result = item;
- break;
- }
- }
-
- return result;
- }
-
- public void initConfiguration() {
- if (configuration == null) {
- Properties properties = serverInfo.getServerProperties();
- List<PropertyItem> itemDefs = new ServerProperties().getPropertyItems();
-
- if ((serverInfo.getProduct() == ServerInformation.Product.JON)
- && !serverInfo.isUnsupportedJonFeaturesEnabled()) {
- LOG.debug("Hiding the embedded agent props and the unsupported DB types...");
- for (PropertyItem itemDef : itemDefs) {
- if (itemDef.getPropertyName().startsWith(ServerProperties.PREFIX_PROP_EMBEDDED_AGENT)) {
- itemDef.setHidden(true);
- }
-
- if (itemDef.getPropertyName().equals(ServerProperties.PROP_DATABASE_TYPE)) {
- List<SelectItem> options = itemDef.getOptions();
- for (Iterator<SelectItem> iterator = options.iterator(); iterator.hasNext();) {
- SelectItem option = iterator.next();
- String databaseType = (String) option.getValue();
- if (!JON_SUPPORTED_DATABASE_TYPES.contains(databaseType)) {
- iterator.remove();
- }
- }
- }
- }
- }
-
- configuration = new ArrayList<PropertyItemWithValue>();
-
- for (PropertyItem itemDef : itemDefs) {
- String property = properties.getProperty(itemDef.getPropertyName());
- PropertyItemWithValue value = new PropertyItemWithValue(itemDef, property);
- configuration.add(value);
- }
-
- // force some hardcoded defaults for IBM JVMs that must have specific values
- boolean isIBM = System.getProperty("java.vendor", "").contains("IBM");
- if (isIBM) {
- String[] algPropNames = { ServerProperties.PROP_TOMCAT_SECURITY_ALGORITHM,
- ServerProperties.PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM,
- ServerProperties.PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM,
- ServerProperties.PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM,
- ServerProperties.PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM };
-
- for (String algPropName : algPropNames) {
- PropertyItemWithValue prop = getConfigurationProperty(this.configuration, algPropName);
- if (prop != null) {
- prop.setValue("IbmX509");
- }
- }
- }
- }
-
- return;
- }
-
- /**
- * Loads in the server's current configuration and returns all the settings.
- *
- * @return current server settings
- */
- public List<PropertyItemWithValue> getConfiguration() {
- // prepare the items to return - only return the basic settings unless showing advanced, too
- List<PropertyItemWithValue> retConfig;
-
- if (showAdvancedSettings.booleanValue()) {
- retConfig = configuration;
- } else {
- retConfig = new ArrayList<PropertyItemWithValue>();
- for (PropertyItemWithValue item : configuration) {
- if (!item.getItemDefinition().isAdvanced()) {
- retConfig.add(item);
- }
- }
- }
-
- return retConfig;
- }
-
- /**
- * Loads in the server's current configuration and returns all the settings except
- * database related properties. This additionally strips out hidden properties too,
- * so the caller will not see any of the hidden properties in the returned list.
- *
- * @return current server settings, minus database related settings and hidden settings.
- *
- * @see #getDatabaseConfiguration()
- * @see #getConfiguration()
- */
- public List<PropertyItemWithValue> getNonDatabaseConfiguration() {
- List<PropertyItemWithValue> allConfig = getConfiguration();
- List<PropertyItemWithValue> retConfig = new ArrayList<PropertyItemWithValue>();
-
- for (PropertyItemWithValue item : allConfig) {
- if (!(item.getItemDefinition().getPropertyName().startsWith(ServerProperties.PREFIX_PROP_DATABASE) || item
- .getItemDefinition().isHidden())) {
-
- retConfig.add(item);
- }
- }
-
- return retConfig;
- }
-
- /**
- * Loads in the server's current configuration and returns only the database related properties.
- *
- * @return current database settings
- *
- * @see #getNonDatabaseConfiguration()
- * @see #getConfiguration()
- */
- public List<PropertyItemWithValue> getDatabaseConfiguration() {
- List<PropertyItemWithValue> allConfig = getConfiguration();
- List<PropertyItemWithValue> retConfig = new ArrayList<PropertyItemWithValue>();
-
- for (PropertyItemWithValue item : allConfig) {
- if (item.getItemDefinition().getPropertyName().startsWith(ServerProperties.PREFIX_PROP_DATABASE)
- && !item.getItemDefinition().isHidden()) {
- retConfig.add(item);
- }
- }
-
- return retConfig;
- }
-
- /**
- * Checks to see if the server has been preconfigured and should be auto-installed. If <code>true</code>
- * is returned, the installer webapp should not be needed to install the server and the installer should
- * immediately begin the installation process.
- *
- * @return <code>true</code> if auto-install should occur; <code>false</code> means the user needs to use
- * the installer GUI before the installation can begin
- */
- public boolean isAutoinstallEnabled() {
- PropertyItemWithValue enableProp = getConfigurationPropertyFromAll(ServerProperties.PROP_AUTOINSTALL_ENABLE);
- if (enableProp != null) {
- return Boolean.parseBoolean(enableProp.getValue());
- }
- return false;
- }
-
- public void setConfiguration(List<PropertyItemWithValue> newConfig) {
- PropertyItemWithValue oldValue;
-
- // we can't just store the entire thing because newConfig may be missing items (if not viewing advanced)
- // just loop through the new config and overwrite the old values with the new values
- for (PropertyItemWithValue newValue : newConfig) {
- oldValue = findPropertyItemWithValue(newValue.getItemDefinition().getPropertyName());
- oldValue.setValue(newValue.getValue());
- }
-
- return;
- }
-
- public Boolean isShowAdvancedSettings() {
- return showAdvancedSettings;
- }
-
- public Boolean getShowAdvancedSettings() {
- return showAdvancedSettings;
- }
-
- public void setShowAdvancedSettings(Boolean showAdvancedSettings) {
- if (showAdvancedSettings == null) {
- showAdvancedSettings = Boolean.FALSE;
- }
-
- this.showAdvancedSettings = showAdvancedSettings;
- }
-
- public String getLastError() {
- return (lastError != null) ? lastError.replaceAll("'", "\\\\'") : null;
- }
-
- public String getLastTest() {
- return (lastTest != null) ? lastTest.replaceAll("'", "\\\\'") : null;
- }
-
- public String getLastCreate() {
- return (lastCreate != null) ? lastCreate.replaceAll("'", "\\\\'") : null;
- }
-
- public String getAdminConnectionUrl() {
- if (adminConnectionUrl == null) {
- adminConnectionUrl = getConfigurationAsProperties(configuration).getProperty(
- ServerProperties.PROP_DATABASE_CONNECTION_URL);
- }
- return adminConnectionUrl;
- }
-
- public void setAdminConnectionUrl(String adminUrl) {
- this.adminConnectionUrl = adminUrl;
- }
-
- public String getAdminUsername() {
- if (adminUsername == null) {
- Properties config = getConfigurationAsProperties(configuration);
- String dbtype = config.getProperty(ServerProperties.PROP_DATABASE_TYPE);
- if (dbtype != null) {
- if (dbtype.toLowerCase().indexOf("oracle") > -1) {
- adminUsername = "sys";
- } else if (dbtype.toLowerCase().indexOf("postgres") > -1) {
- adminUsername = "postgres";
- } else if (dbtype.toLowerCase().indexOf("h2") > -1) {
- adminUsername = "sa";
- } else if (dbtype.toLowerCase().indexOf("sqlserver") > -1) {
- adminUsername = "sa";
- } else if (dbtype.toLowerCase().indexOf("mysql") > -1) {
- adminUsername = "mysqladmin";
- }
- }
- }
-
- return adminUsername;
- }
-
- public void setAdminUsername(String adminUsername) {
- this.adminUsername = adminUsername;
- }
-
- public String getAdminPassword() {
- return adminPassword;
- }
-
- public void setAdminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- }
-
- public StartPageResults testConnection() {
- Properties configurationAsProperties = getConfigurationAsProperties(configuration);
-
- // its possible the JDBC URL was changed, clear the factory cache in case the DB version is different now
- DatabaseTypeFactory.clearDatabaseTypeCache();
-
- try {
- serverInfo.ensureDatabaseIsSupported(configurationAsProperties);
- lastTest = "OK";
- } catch (Exception e) {
- LOG.warn("Installer failed to test connection", e);
- lastTest = e.toString();
- }
-
- return StartPageResults.STAY;
- }
-
- public StartPageResults showCreateDatabasePage() {
- adminConnectionUrl = null;
- adminUsername = null;
- adminPassword = null;
- return StartPageResults.CREATEDB;
- }
-
- public StartPageResults createDatabase() {
- Properties config = getConfigurationAsProperties(configuration);
- String dbType = config.getProperty(ServerProperties.PROP_DATABASE_TYPE, "-unknown-");
-
- Properties adminConfig = new Properties();
- adminConfig.put(ServerProperties.PROP_DATABASE_CONNECTION_URL, adminConnectionUrl);
- adminConfig.put(ServerProperties.PROP_DATABASE_USERNAME, adminUsername);
- adminConfig.put(ServerProperties.PROP_DATABASE_PASSWORD, adminPassword);
-
- Connection conn = null;
- Statement stmt = null;
-
- // If we successfully add the user/database, we'll change the values in the UI
- // by modifying the configuration property items that this bean manages.
- PropertyItemWithValue propertyItemUsername = null;
- PropertyItemWithValue propertyItemPassword = null;
- PropertyItemWithValue propertyItemUrl = null;
-
- for (PropertyItemWithValue item : configuration) {
- String propName = item.getItemDefinition().getPropertyName();
- if (propName.equals(ServerProperties.PROP_DATABASE_USERNAME)) {
- propertyItemUsername = item;
- } else if (propName.equals(ServerProperties.PROP_DATABASE_PASSWORD)) {
- propertyItemPassword = item;
- } else if (propName.equals(ServerProperties.PROP_DATABASE_CONNECTION_URL)) {
- propertyItemUrl = item;
- }
- }
-
- if (propertyItemUsername == null || propertyItemPassword == null || propertyItemUrl == null) {
- throw new NullPointerException("Missing a property item - this is a bug please report it");
- }
-
- LOG.info("Will attempt to create user/database 'rhqadmin' using URL [" + getAdminConnectionUrl()
- + "] and admin user [" + getAdminUsername() + "]. Admin password was"
- + (getAdminPassword().length() > 0 ? " not " : " ") + "empty");
-
- try {
- String sql1, sql2;
-
- conn = serverInfo.getDatabaseConnection(adminConfig);
- conn.setAutoCommit(true);
- stmt = conn.createStatement();
-
- if (dbType.equalsIgnoreCase("postgresql")) {
- sql1 = "CREATE ROLE rhqadmin LOGIN ENCRYPTED PASSWORD 'rhqadmin' NOSUPERUSER NOINHERIT CREATEDB NOCREATEROLE";
- sql2 = "CREATE DATABASE rhq WITH OWNER = rhqadmin ENCODING = 'SQL_ASCII' TABLESPACE = pg_default";
- } else if (dbType.equalsIgnoreCase("oracle10g")) {
- sql1 = "CREATE USER rhqadmin IDENTIFIED BY rhqadmin";
- sql2 = "GRANT connect, resource TO rhqadmin";
- } else if (dbType.equalsIgnoreCase("h2")) {
- // I have no idea if these are correct for H2 - I just copied oracle's sql
- sql1 = "CREATE USER rhqadmin IDENTIFIED BY rhqadmin";
- sql2 = "GRANT connect, resource TO rhqadmin";
- } else if (dbType.equalsIgnoreCase("sqlserver")) {
- // I have no idea if these are correct for sql server - I just copied oracle's sql
- sql1 = "CREATE USER rhqadmin IDENTIFIED BY rhqadmin";
- sql2 = "GRANT connect, resource TO rhqadmin";
- } else {
- throw new Exception("Unknown database type: " + dbType);
- }
-
- stmt.addBatch(sql1);
- stmt.addBatch(sql2);
- int[] results = stmt.executeBatch();
-
- if (results[0] == Statement.EXECUTE_FAILED)
- throw new Exception("Failed to execute: " + sql1);
- if (results[1] == Statement.EXECUTE_FAILED)
- throw new Exception("Failed to execute: " + sql2);
-
- // success! let's set our properties to the values we just created
- propertyItemUsername.setValue("rhqadmin");
- propertyItemPassword.setValue("rhqadmin");
- if (dbType.equalsIgnoreCase("postgresql") || dbType.equalsIgnoreCase("mysql")) {
- if (!propertyItemUrl.getValue().endsWith("/rhq")) {
- propertyItemUrl.setValue(propertyItemUrl.getValue() + "/rhq");
- }
- }
-
- testConnection();
-
- lastCreate = "OK";
- } catch (Exception e) {
- LOG.warn("Installer failed to create database", e);
- lastCreate = ThrowableUtil.getAllMessages(e);
- } finally {
- adminConnectionUrl = null;
- adminUsername = null;
- adminPassword = null;
-
- if (stmt != null)
- try {
- stmt.close();
- } catch (Exception e) {
- }
- if (conn != null)
- try {
- conn.close();
- } catch (Exception e) {
- }
- }
-
- return StartPageResults.STAY;
- }
-
- public String getDataDirectory() {
- try {
- String path = this.serverInfo.getDataDirectory().getCanonicalPath();
- path = path.replace('\\', '/'); // in case we are on windows, we still want forward slashes
- return path;
- } catch (Exception e) {
- throw new RuntimeException(e); // this should never happen unless the file system is out of wack
- }
- }
-
- public boolean isDatabaseSchemaExist() {
- try {
- Properties configurationAsProperties = getConfigurationAsProperties(configuration);
- return serverInfo.isDatabaseSchemaExist(configurationAsProperties);
- } catch (Exception e) {
- LOG.info("Could not determine database existence: " + e);
- return false;
- }
- }
-
- public String getExistingSchemaOption() {
- return this.existingSchemaOption;
- }
-
- public void setExistingSchemaOption(String existingSchemaOption) {
- // this is allowed to be null to support auto-installer
- this.existingSchemaOption = existingSchemaOption;
- }
-
- public boolean isKeepExistingSchema() {
- return ExistingSchemaOption.KEEP.name().equals(existingSchemaOption)
- || ExistingSchemaOption.SKIP.name().equals(existingSchemaOption);
- }
-
- public StartPageResults saveEmbeddedMode() {
- // embedded mode simply means use our embedded database and the embedded agent - used mainly for demo purposes
-
- // set embedded agent enabled to true
- PropertyItemWithValue prop = getConfigurationPropertyFromAll(ServerProperties.PROP_EMBEDDED_AGENT_ENABLED);
- prop.setValue(Boolean.TRUE.toString());
- List<PropertyItemWithValue> newConfig = new ArrayList<PropertyItemWithValue>(1);
- newConfig.add(prop);
- setConfiguration(newConfig);
-
- // use the H2 database, which is our embedded DB
- List<PropertyItemWithValue> dbConfig = getDatabaseConfiguration();
- for (PropertyItemWithValue dbProp : dbConfig) {
- if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_CONNECTION_URL)) {
- dbProp.setValue("jdbc:h2:" + getDataDirectory() + "/rhq;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOG=2");
- } else if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_TYPE)) {
- dbProp.setValue("H2");
- } else if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_DRIVER_CLASS)) {
- dbProp.setValue("org.h2.Driver");
- } else if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_XA_DS_CLASS)) {
- dbProp.setValue("org.h2.jdbcx.JdbcDataSource");
- } else if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_USERNAME)) {
- dbProp.setValue("rhqadmin");
- } else if (dbProp.getItemDefinition().getPropertyName().equals(ServerProperties.PROP_DATABASE_PASSWORD)) {
- dbProp.setValue("rhqadmin");
- }
- }
- setExistingSchemaOption(ExistingSchemaOption.OVERWRITE.name());
-
- return save();
- }
-
- public StartPageResults save() {
- // log the raw values but don't write out the potentially unobfuscated db password
- Properties props = getConfigurationAsProperties(configuration);
- props.remove(ServerProperties.PROP_DATABASE_PASSWORD);
- LOG.info("Installer: raw values (these may be updated by the installer, see submitted values below): " + props);
-
- // if auto-install is enabled, the db password will be encrypted - decrypt it internally and we'll re-encrypt later
- if (isAutoinstallEnabled()) {
- try {
- PropertyItemWithValue prop = getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_PASSWORD);
- String pass = prop.getValue();
- pass = decodePassword(pass);
- prop.setValue(pass);
- // log the unencrypted pw, but only at the trace level so it isn't put in the log file
- // unless someone explicitly enables the trace level so they can see the pass that is to be used for debugging
- LOG.trace(">" + pass);
- } catch (Exception e) {
- LOG.fatal("Could not decrypt the password for some reason - auto-installation failed", e);
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.SAVE_ERROR, ThrowableUtil.getAllMessages(e));
- return StartPageResults.ERROR;
- }
- }
-
- // its possible the JDBC URL was changed, clear the factory cache in case the DB version is different now
- DatabaseTypeFactory.clearDatabaseTypeCache();
-
- try {
- // update server properties with the latest ha info to keep the form and server properties file up to date
- getConfigurationPropertyFromAll(ServerProperties.PROP_HIGH_AVAILABILITY_NAME).setValue(
- getHaServer().getName());
- getConfigurationPropertyFromAll(ServerProperties.PROP_HTTP_PORT).setValue(
- getHaServer().getEndpointPortString());
- getConfigurationPropertyFromAll(ServerProperties.PROP_HTTPS_PORT).setValue(
- getHaServer().getEndpointSecurePortString());
-
- // the comm bind port is a special setting - it is allowed to be blank;
- // if it was originally blank, it will have been set to 0 because its an integer property;
- // but we do not want it to be 0, so make sure we switch it back to empty
- PropertyItemWithValue portConfig = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_BIND_PORT);
- if ("0".equals(portConfig.getValue())) {
- portConfig.setRawValue("");
- }
- } catch (Exception e) {
- LOG.fatal("Could not save the settings for some reason", e);
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.SAVE_ERROR, ThrowableUtil.getAllMessages(e));
-
- return StartPageResults.ERROR;
- }
-
- try {
- String url = getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_CONNECTION_URL).getValue();
- String db = getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_TYPE).getValue();
- Pattern pattern = null;
- if (db.toLowerCase().indexOf("postgres") > -1) {
- pattern = Pattern.compile(".*://(.*):([0123456789]+)/(.*)"); // jdbc:postgresql://host.name:5432/rhq
- } else if (db.toLowerCase().indexOf("oracle") > -1) {
- LOG.info("Oracle does not need to have server-name, port and db-name individually set, skipping");
- // if we ever find that we'll need these props set, uncomment below and it should all work
- //pattern = Pattern.compile(".*@(.*):([0123456789]+):(.*)"); // jdbc:oracle:thin:@host.name:1521:rhq
- } else if (db.toLowerCase().indexOf("h2") > -1) {
- LOG.info("H2 does not need to have server-name, port and db-name individually set, skipping");
- } else if (db.toLowerCase().indexOf("sqlserver") > -1) {
- pattern = Pattern.compile("(?i).*://(.*):([0123456789]+).*databaseName=([^;]*)"); // jdbc:jtds:sqlserver://localhost:7777;databaseName=rhq
- } else {
- LOG.info("Unknown database type - will not set server-name, port and db-name");
- // don't bother throwing error; these three extra settings may not be necessary anyway
- }
- if (pattern != null) {
- Matcher match = pattern.matcher(url);
- if (match.find() && (match.groupCount() == 3)) {
- String serverName = match.group(1);
- String port = match.group(2);
- String dbName = match.group(3);
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_SERVER_NAME).setValue(serverName);
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_PORT).setValue(port);
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_DB_NAME).setValue(dbName);
- } else {
- throw new Exception("Cannot get server, port or db name from connection URL: " + url);
- }
- } else {
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_SERVER_NAME).setValue("");
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_PORT).setValue("");
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_DB_NAME).setValue("");
- }
- } catch (Exception e) {
- LOG.fatal("JDBC connection URL seems to be invalid", e);
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.SAVE_ERROR, ThrowableUtil.getAllMessages(e));
-
- return StartPageResults.ERROR;
- }
-
- try {
- String db = getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_TYPE).getValue();
- String dialect;
- String quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.StdJDBCDelegate";
- String quartzSelectWithLockSQL = "SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE";
- String quartzLockHandlerClass = "org.quartz.impl.jdbcjobstore.StdRowLockSemaphore";
-
- if (db.toLowerCase().indexOf("postgres") > -1) {
- dialect = "org.hibernate.dialect.PostgreSQLDialect";
- quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate";
- } else if (db.toLowerCase().indexOf("oracle") > -1) {
- dialect = "org.hibernate.dialect.Oracle10gDialect";
- quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.oracle.OracleDelegate";
- } else if (db.toLowerCase().indexOf("h2") > -1) {
- dialect = "org.rhq.core.domain.server.H2CustomDialect";
- } else if (db.toLowerCase().indexOf("sqlserver") > -1) {
- dialect = "org.hibernate.dialect.SQLServerDialect";
- quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.MSSQLDelegate";
- quartzSelectWithLockSQL = "SELECT * FROM {0}LOCKS ROWLOCK WITH (HOLDLOCK,XLOCK) WHERE LOCK_NAME = ?";
- quartzLockHandlerClass = "org.quartz.impl.jdbcjobstore.UpdateLockRowSemaphore";
- } else if (db.toLowerCase().indexOf("mysql") > -1) {
- dialect = "org.hibernate.dialect.MySQL5InnoDBDialect";
- quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate";
- } else {
- throw new Exception("Unknown db type: " + db);
- }
-
- getConfigurationPropertyFromAll(ServerProperties.PROP_DATABASE_HIBERNATE_DIALECT).setValue(dialect);
- getConfigurationPropertyFromAll(ServerProperties.PROP_QUARTZ_DRIVER_DELEGATE_CLASS).setValue(
- quartzDriverDelegateClass);
- getConfigurationPropertyFromAll(ServerProperties.PROP_QUARTZ_SELECT_WITH_LOCK_SQL).setValue(
- quartzSelectWithLockSQL);
- getConfigurationPropertyFromAll(ServerProperties.PROP_QUARTZ_LOCK_HANDLER_CLASS).setValue(
- quartzLockHandlerClass);
-
- } catch (Exception e) {
- LOG.fatal("Invalid database type", e);
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.SAVE_ERROR, ThrowableUtil.getAllMessages(e));
-
- return StartPageResults.ERROR;
- }
-
- Properties configurationAsProperties = getConfigurationAsProperties(configuration);
- testConnection(); // so our lastTest gets set and the user will be able to get the error in the UI
- if (lastTest == null || !lastTest.equals("OK")) {
- lastError = lastTest;
- return StartPageResults.ERROR;
- }
-
- // Ensure server info has been set
- if ((null == haServer) || (null == haServer.getName()) || "".equals(haServer.getName().trim())) {
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.INVALID_STRING,
- I18Nmsg.getMsg(InstallerI18NResourceKeys.PROP_HIGH_AVAILABILITY_NAME));
- return StartPageResults.ERROR;
- }
-
- for (PropertyItemWithValue newValue : configuration) {
- if (Integer.class.isAssignableFrom(newValue.getItemDefinition().getPropertyType())) {
- try {
- Integer.parseInt(newValue.getValue());
- } catch (Exception e) {
- // there is one special property - the connector bind port - that is allowed to be empty
- // ignore this error if we are looking at that property and its empty; otherwise, this is an error
- if (!(newValue.getItemDefinition().getPropertyName()
- .equals(ServerProperties.PROP_CONNECTOR_BIND_PORT) && newValue.getValue().length() == 0)) {
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.INVALID_NUMBER, newValue
- .getItemDefinition().getPropertyLabel(), newValue.getValue());
- return StartPageResults.ERROR;
- }
- }
- } else if (Boolean.class.isAssignableFrom(newValue.getItemDefinition().getPropertyType())) {
- try {
- if (newValue.getValue() == null) {
- newValue.setValue(Boolean.FALSE.toString());
- }
-
- Boolean.parseBoolean(newValue.getValue());
- } catch (Exception e) {
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.INVALID_BOOLEAN, newValue.getItemDefinition()
- .getPropertyLabel(), newValue.getValue());
- return StartPageResults.ERROR;
- }
- }
- }
-
- try {
- // indicate that no errors occurred
- lastError = null;
-
- // save the properties
- serverInfo.setServerProperties(configurationAsProperties);
-
- // prepare the db schema
- if (!ExistingSchemaOption.SKIP.name().equals(existingSchemaOption)) {
- if (serverInfo.isDatabaseSchemaExist(configurationAsProperties)) {
- if (existingSchemaOption == null) {
- if (!isAutoinstallEnabled()) {
- return StartPageResults.STAY; // user didn't tell us what to do, re-display the page with the question
- }
- // we are supposed to auto-install but wasn't explicitly told what to do - the default is "auto"
- // and since we know the database schema exists, that means we upgrade it
- }
-
- if (ExistingSchemaOption.OVERWRITE.name().equals(existingSchemaOption)) {
- serverInfo.createNewDatabaseSchema(configurationAsProperties);
- } else {
- serverInfo.upgradeExistingDatabaseSchema(configurationAsProperties);
- }
- } else {
- serverInfo.createNewDatabaseSchema(configurationAsProperties);
- }
- }
-
- // Ensure the install server info is up to date and stored in the DB
- serverInfo.storeServer(configurationAsProperties, haServer);
-
- // encode database password and set updated properties
- String pass = configurationAsProperties.getProperty(ServerProperties.PROP_DATABASE_PASSWORD);
- pass = encryptPassword(pass);
- configurationAsProperties.setProperty(ServerProperties.PROP_DATABASE_PASSWORD, pass);
-
- serverInfo.setServerProperties(configurationAsProperties);
-
- // We have changed the password of the database connection, so we need to
- // tell the login config about it
- serverInfo.restartLoginConfig();
-
- // build a keystore whose cert has a CN of this server's public endpoint address
- serverInfo.createKeystore(haServer);
-
- // now deploy RHQ Server fully
- serverInfo.moveDeploymentArtifacts(true);
- } catch (Exception e) {
- LOG.fatal("Failed to update properties and fully deploy - " + serverInfo.getProduct()
- + " Server will not function properly.", e);
- lastError = I18Nmsg.getMsg(InstallerI18NResourceKeys.SAVE_FAILURE, ThrowableUtil.getAllMessages(e));
-
- return StartPageResults.ERROR;
- }
-
- LOG.info("Installer: final submitted values: " + configurationAsProperties);
-
- return StartPageResults.SUCCESS;
- }
-
- private String encryptPassword(String password) throws Exception {
-
- // We need to do some mumbo jumbo, as the interesting method is private
- // in SecureIdentityLoginModule
-
- try {
- SecureIdentityLoginModule lm = new SecureIdentityLoginModule();
- Class<?> clazz = SecureIdentityLoginModule.class;
- Method m = clazz.getDeclaredMethod("encode", String.class);
- m.setAccessible(true);
- String res = (String) m.invoke(lm, password);
- return res;
- } catch (Exception e) {
- throw new Exception("Encoding db password failed: ", e);
- }
- }
-
- private String decodePassword(String encrypedPassword) throws Exception {
-
- // We need to do some mumbo jumbo, as the interesting method is private
- // in SecureIdentityLoginModule
-
- try {
- SecureIdentityLoginModule lm = new SecureIdentityLoginModule();
- Class<?> clazz = SecureIdentityLoginModule.class;
- Method m = clazz.getDeclaredMethod("decode", String.class);
- m.setAccessible(true);
- char[] res = (char[]) m.invoke(lm, encrypedPassword);
- return new String(res);
- } catch (Exception e) {
- throw new Exception("Decoding db password failed: ", e);
- }
- }
-
- private Properties getConfigurationAsProperties(List<PropertyItemWithValue> config) {
- Properties props = new Properties();
-
- for (PropertyItemWithValue itemWithValue : config) {
- props.setProperty(itemWithValue.getItemDefinition().getPropertyName(), itemWithValue.getValue());
- }
-
- return props;
- }
-
- private PropertyItemWithValue findPropertyItemWithValue(String propertyName) {
- for (PropertyItemWithValue value : configuration) {
- if (value.getItemDefinition().getPropertyName().equals(propertyName)) {
- return value;
- }
- }
-
- return null;
- }
-
- public List<SelectItem> getExistingSchemaOptions() {
- if (existingSchemaOptions == null) {
- existingSchemaOptions = new ArrayList<SelectItem>();
- existingSchemaOptions.add(new SelectItem(ExistingSchemaOption.OVERWRITE.name(), I18Nmsg
- .getMsg(InstallerI18NResourceKeys.EXISTING_SCHEMA_OPTION_OVERWRITE)));
- existingSchemaOptions.add(new SelectItem(ExistingSchemaOption.KEEP.name(), I18Nmsg
- .getMsg(InstallerI18NResourceKeys.EXISTING_SCHEMA_OPTION_KEEP)));
- existingSchemaOptions.add(new SelectItem(ExistingSchemaOption.SKIP.name(), I18Nmsg
- .getMsg(InstallerI18NResourceKeys.EXISTING_SCHEMA_OPTION_SKIP)));
- }
- return existingSchemaOptions;
- }
-
- /** To set the server name use setServerName() */
- public PropertyItemWithValue getPropHaServerName() {
- return getConfigurationPropertyFromAll(ServerProperties.PROP_HIGH_AVAILABILITY_NAME);
- }
-
- public PropertyItemWithValue getPropHaEndpointPort() {
- return getConfigurationPropertyFromAll(ServerProperties.PROP_HTTP_PORT);
- }
-
- public PropertyItemWithValue getPropHaEndpointSecurePort() {
- return getConfigurationPropertyFromAll(ServerProperties.PROP_HTTPS_PORT);
- }
-
- public boolean isRegisteredServers() {
-
- if (!this.isKeepExistingSchema())
- return false;
-
- List<SelectItem> registeredServerNames = getRegisteredServerNames();
-
- return ((null != registeredServerNames) && !registeredServerNames.isEmpty());
- }
-
- public boolean isInstallationSettingsConfigurable() {
- String selectedServer = getSelectedRegisteredServerName();
- return selectedServer == null || selectedServer.isEmpty()
- || selectedServer.equals(I18Nmsg.getMsg(InstallerI18NResourceKeys.NEW_SERVER_SELECT_ITEM));
- }
-
- public List<SelectItem> getRegisteredServerNames() {
- List<SelectItem> result = new ArrayList<SelectItem>(0);
-
- if (!isDatabaseSchemaExist())
- return result;
-
- try {
- Properties configurationAsProperties = getConfigurationAsProperties(configuration);
- for (String serverName : serverInfo.getServerNames(configurationAsProperties)) {
- result.add(new SelectItem(serverName));
- }
- if (!result.isEmpty()) {
- result.add(0, new SelectItem(I18Nmsg.getMsg(InstallerI18NResourceKeys.NEW_SERVER_SELECT_ITEM)));
- }
- } catch (Exception e) {
- // Should not be able to get here since we checked for schema above
- LOG.warn("Unexpected Exception getting registered server info: ", e);
- }
-
- return result;
- }
-
- public String getSelectedRegisteredServerName() {
- return selectedRegisteredServerName;
- }
-
- // If an existing server name is selected from the list set haServerName to the selection. Note, this function
- // should not call getServerConfiguration.setValue()
- public void setSelectedRegisteredServerName(String selectedRegisteredServerName) {
- this.selectedRegisteredServerName = selectedRegisteredServerName;
- setHaServerName(selectedRegisteredServerName);
- }
-
- public String getHaServerName() {
- return haServerName;
- }
-
- public void setHaServerName(String serverName) {
- // handle the case where the user selected the dummy entry in the registered servers drop down
- if (I18Nmsg.getMsg(InstallerI18NResourceKeys.NEW_SERVER_SELECT_ITEM).equals(serverName)) {
- serverName = this.getDefaultServerName();
- }
-
- this.haServerName = serverName;
-
- // try pulling info from the database for this server name
- if (isRegisteredServers()) {
- Properties configurationAsProperties = getConfigurationAsProperties(configuration);
- setHaServer(serverInfo.getServerDetail(configurationAsProperties, serverName));
- }
-
- // if the server was not registered in the database then populate the ha server info with proper defaults
- if (null == getHaServer()) {
- String endpointAddress = "";
-
- try {
- endpointAddress = InetAddress.getLocalHost().getCanonicalHostName();
- } catch (Exception e) {
- LOG.info("Could not determine default server address: ", e);
- }
-
- setHaServer(new ServerInformation.Server(serverName, endpointAddress,
- ServerInformation.Server.DEFAULT_ENDPOINT_PORT, ServerInformation.Server.DEFAULT_ENDPOINT_SECURE_PORT,
- ServerInformation.Server.DEFAULT_AFFINITY_GROUP));
-
- // override default settings with current property values
- try {
- getHaServer().setEndpointPortString(
- getConfigurationPropertyFromAll(ServerProperties.PROP_HTTP_PORT).getValue());
- } catch (Exception e) {
- LOG.debug("Could not determine default port: ", e);
- }
-
- try {
- getHaServer().setEndpointSecurePortString(
- getConfigurationPropertyFromAll(ServerProperties.PROP_HTTPS_PORT).getValue());
- } catch (Exception e) {
- LOG.debug("Could not determine default secure port: ", e);
- }
- } else {
- getHaServer().setName(serverName);
- }
- }
-
- /**
- * This method will set the HA Server information based solely on the server configuration
- * properties. It does not rely on any database access.
- *
- * This is used by the auto-installation process - see {@link AutoInstallServlet}.
- *
- * @throws Exception
- */
- public void setHaServerFromPropertiesOnly() throws Exception {
-
- PropertyItemWithValue preconfigDb = getConfigurationPropertyFromAll(ServerProperties.PROP_AUTOINSTALL_DB);
- if (preconfigDb != null && preconfigDb.getValue() != null) {
- if ("overwrite".equals(preconfigDb.getValue().toLowerCase())) {
- setExistingSchemaOption(ExistingSchemaOption.OVERWRITE.name());
- } else if ("skip".equals(preconfigDb.getValue().toLowerCase())) {
- setExistingSchemaOption(ExistingSchemaOption.SKIP.name());
- } else if ("auto".equals(preconfigDb.getValue().toLowerCase())) {
- setExistingSchemaOption(null);
- } else {
- LOG.warn("An invalid setting for [" + ServerProperties.PROP_AUTOINSTALL_DB + "] was provided: ["
- + preconfigDb.getValue()
- + "]. Valid values are 'auto', 'overwrite' or 'skip'. Defaulting to 'auto'");
- preconfigDb.setRawValue("auto");
- setExistingSchemaOption(null);
- }
- } else {
- LOG.debug("[" + ServerProperties.PROP_AUTOINSTALL_DB + "] was not provided. Defaulting to 'auto'");
- setExistingSchemaOption(null);
- }
-
- // create a ha server stub with some defaults - we'll fill this in based on our property settings
- ServerInformation.Server preconfiguredHaServer = new ServerInformation.Server("", "",
- ServerInformation.Server.DEFAULT_ENDPOINT_PORT, ServerInformation.Server.DEFAULT_ENDPOINT_SECURE_PORT,
- ServerInformation.Server.DEFAULT_AFFINITY_GROUP);
-
- // determine the name of the server - its either preconfigured as the high availability name, or
- // we auto-determine it by using the machine's canonical hostname
- PropertyItemWithValue haNameProp = getPropHaServerName();
- if (haNameProp != null) {
- preconfiguredHaServer.setName(haNameProp.getValue()); // this leaves it alone if value is null or empty
- }
- if (preconfiguredHaServer.getName().equals("")) {
- String serverName = getDefaultServerName(); // gets hostname
- if (serverName == null || "".equals(serverName)) {
- throw new Exception("Server name is not preconfigured and could not be determined automatically");
- }
- preconfiguredHaServer.setName(serverName);
- }
-
- // the public endpoint address is one that can be preconfigured in the special autoinstall property.
- // if that is not specified, then we use either the connector's bind address or the server bind address.
- // if nothing was specified, we'll default to the canonical host name.
- String publicEndpointAddress;
-
- PropertyItemWithValue preconfigAddr = getConfigurationPropertyFromAll(ServerProperties.PROP_AUTOINSTALL_PUBLIC_ENDPOINT);
- if (preconfigAddr != null && preconfigAddr.getValue() != null && !"".equals(preconfigAddr.getValue().trim())) {
- // its preconfigured using the autoinstall setting, use that and ignore the other settings
- publicEndpointAddress = preconfigAddr.getValue().trim();
- } else {
- PropertyItemWithValue connBindAddress = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_BIND_ADDRESS);
- if (connBindAddress != null && connBindAddress.getValue() != null
- && !"".equals(connBindAddress.getValue().trim())
- && !"0.0.0.0".equals(connBindAddress.getValue().trim())) {
- // the server-side connector bind address is explicitly set, use that
- publicEndpointAddress = connBindAddress.getValue().trim();
- } else {
- PropertyItemWithValue serverBindAddress = getConfigurationPropertyFromAll(ServerProperties.PROP_SERVER_BIND_ADDRESS);
- if (serverBindAddress != null && serverBindAddress.getValue() != null
- && !"".equals(serverBindAddress.getValue().trim())
- && !"0.0.0.0".equals(serverBindAddress.getValue().trim())) {
- // the main JBossAS server bind address is set and it isn't 0.0.0.0, use that
- publicEndpointAddress = serverBindAddress.getValue().trim();
- } else {
- publicEndpointAddress = InetAddress.getLocalHost().getCanonicalHostName();
- }
- }
- }
- preconfiguredHaServer.setEndpointAddress(publicEndpointAddress);
-
- // define the public endpoint ports.
- // note that if using a different transport other than (ssl)servlet, we'll
- // take the connector's bind port and use it for both ports. This is to support a special deployment
- // use-case - 99% of the time, the agents will go through the web/tomcat connector and thus we'll use
- // the http/https ports for the public endpoints.
- PropertyItemWithValue connectorTransport = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_TRANSPORT);
- if (connectorTransport != null && connectorTransport.getValue() != null
- && connectorTransport.getValue().contains("socket")) {
-
- // we aren't using the (ssl)servlet protocol, take the connector bind port and use it for the public endpoint ports
- PropertyItemWithValue connectorBindPort = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_BIND_PORT);
- if (connectorBindPort == null || connectorBindPort.getValue() == null
- || "".equals(connectorBindPort.getValue().trim()) || "0".equals(connectorBindPort.getValue().trim())) {
- throw new Exception("Using non-servlet transport [" + connectorTransport + "] but didn't define a port");
- }
- preconfiguredHaServer.setEndpointPort(Integer.parseInt(connectorBindPort.getValue()));
- preconfiguredHaServer.setEndpointSecurePort(Integer.parseInt(connectorBindPort.getValue()));
- } else {
- // this is the typical use-case - the transport is probably (ssl)servlet so use the web http/https ports
- try {
- PropertyItemWithValue httpPort = getPropHaEndpointPort();
- preconfiguredHaServer.setEndpointPortString(httpPort.getValue());
- } catch (Exception e) {
- LOG.warn("Could not determine port, will use default: " + e);
- }
-
- try {
- PropertyItemWithValue httpsPort = getPropHaEndpointSecurePort();
- preconfiguredHaServer.setEndpointSecurePortString(httpsPort.getValue());
- } catch (Exception e) {
- LOG.warn("Could not determine secure port, will use default: " + e);
- }
- }
-
- // everything looks good - remember these
- setHaServer(preconfiguredHaServer);
- this.haServerName = preconfiguredHaServer.getName();
- }
-
- public ServerInformation.Server getHaServer() {
- return haServer;
- }
-
- public void setHaServer(ServerInformation.Server haServer) {
- this.haServer = haServer;
- }
-
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/LoggerAntBuildListener.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/LoggerAntBuildListener.java
deleted file mode 100644
index fb2323a..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/LoggerAntBuildListener.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.io.PrintWriter;
-import java.util.Date;
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-
-/**
- * Listens for ANT build events and logs them to a log stream.
- *
- * @author John Mazzitelli
- */
-public class LoggerAntBuildListener implements BuildListener {
- private PrintWriter output;
-
- public LoggerAntBuildListener(PrintWriter logFile) {
- output = logFile;
-
- // just output our first line with the date this was started
- output.println(new Date().toString());
- }
-
- public void buildFinished(BuildEvent event) {
- logEvent(event, "FINISHED!");
- }
-
- public void buildStarted(BuildEvent event) {
- logEvent(event, "STARTED!");
- }
-
- public void messageLogged(BuildEvent event) {
- logEvent(event, null);
- }
-
- public void targetFinished(BuildEvent event) {
- logEvent(event, null);
- }
-
- public void targetStarted(BuildEvent event) {
- logEvent(event, null);
- }
-
- public void taskFinished(BuildEvent event) {
- logEvent(event, null);
- }
-
- public void taskStarted(BuildEvent event) {
- logEvent(event, null);
- }
-
- private void logEvent(BuildEvent event, String additionalMessage) {
- String message = event.getMessage();
- Throwable exception = event.getException();
- Target target = event.getTarget();
- Task task = event.getTask();
-
- if (additionalMessage != null) {
- output.println(additionalMessage);
- }
-
- if (target != null) {
- output.print("[" + target.getName() + "] ");
- }
-
- if (task != null) {
- output.print("[" + task.getTaskName() + "] ");
- }
-
- if (message != null) {
- output.print(message);
- }
-
- if (exception != null) {
- output.println();
- exception.printStackTrace(output);
- }
-
- output.println();
-
- return;
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java
deleted file mode 100644
index 96ff0dd..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Locale;
-
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-
-import mazz.i18n.Msg;
-
-import org.rhq.enterprise.installer.i18n.InstallerI18NResourceKeys;
-
-/**
- * Defines generic information about one particular server property setting (all except its value - see
- * {@link PropertyItemWithValue} for that).
- *
- * <p>If a property change requires the application server to restart in order for the change to take effect,
- * {@link #isRequiresRestart()} will be <code>true</code>.</p>
- *
- * <p>If a property's value is to be considered a secret (like a password), then {@link #isSecret()} will be <code>
- * true</code>.</p>
- *
- * <p>If a property is considered an advanced setting, one that many users, especially beginners, should not be
- * concerned about most times, then {@link #isAdvanced()} will be <code>true</code>.</p>
- *
- * <p>Each property has a name that corresponds to the actual property name as found in the properties file. There is a
- * {@link #getPropertyLabelResourceBundleKey() resource bundle key} associated with each property that corresponds to
- * the property's human readable label. The localized label is usually what you want to display to the user, since the
- * property names themselves may be cryptic to most users.</p>
- *
- * @author John Mazzitelli
- */
-public class PropertyItem {
- private String propertyName;
- private Class<?> propertyType;
- private int fieldSize;
- private boolean requiresRestart;
- private boolean secret;
- private boolean advanced;
- private boolean hidden;
- private List<SelectItem> options;
- private String propertyLabelResourceBundleKey;
- private String helpResourceBundleKey;
- private Msg i18nMsg;
-
- public PropertyItem(String name, Class<?> type, String labelBundleKey, String helpBundleKey,
- boolean requiresRestart, boolean secret, boolean advanced, boolean hidden) {
- setPropertyName(name);
- setPropertyType(type);
- setPropertyLabelResourceBundleKey(labelBundleKey);
- setHelpResourceBundleKey(helpBundleKey);
- setRequiresRestart(requiresRestart);
- setSecret(secret);
- setAdvanced(advanced);
- setHidden(hidden);
-
- if (Number.class.isAssignableFrom(type)) {
- setFieldSize(6);
- } else if (Boolean.class.isAssignableFrom(type)) {
- setFieldSize(6);
- } else if (InetAddress.class.isAssignableFrom(type)) {
- setFieldSize(40); // support v6 too
- } else {
- setFieldSize(60);
- }
- }
-
- // for legacy support
- public PropertyItem(String name, Class<?> type, String labelBundleKey, String helpBundleKey,
- boolean requiresRestart, boolean secret, boolean advanced) {
-
- this(name, type, labelBundleKey, helpBundleKey, requiresRestart, secret, advanced, false);
- }
-
- /**
- * Use this constructor to define a property that is rendered with a drop down box of options
- * to choose from.
- */
- public PropertyItem(String name, Class<?> type, String labelBundleKey, String helpBundleKey,
- boolean requiresRestart, boolean secret, boolean advanced, List<SelectItem> options) {
- this(name, type, labelBundleKey, helpBundleKey, requiresRestart, secret, advanced, false);
- setOptions(options);
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
- }
-
- public Class<?> getPropertyType() {
- return propertyType;
- }
-
- public void setPropertyType(Class<?> propertyType) {
- this.propertyType = propertyType;
- }
-
- public int getFieldSize() {
- return fieldSize;
- }
-
- public void setFieldSize(int fieldSize) {
- this.fieldSize = fieldSize;
- }
-
- public boolean isRequiresRestart() {
- return requiresRestart;
- }
-
- public void setRequiresRestart(boolean requiresRestart) {
- this.requiresRestart = requiresRestart;
- }
-
- public boolean isSecret() {
- return secret;
- }
-
- public void setSecret(boolean secret) {
- this.secret = secret;
- }
-
- public boolean isAdvanced() {
- return advanced;
- }
-
- public List<SelectItem> getOptions() {
- return options;
- }
-
- public void setOptions(List<SelectItem> options) {
- this.options = options;
- }
-
- public void setAdvanced(boolean hidden) {
- this.advanced = hidden;
- }
-
- public boolean isHidden() {
- return hidden;
- }
-
- public void setHidden(boolean hidden) {
- this.hidden = hidden;
- }
-
- public String getPropertyLabelResourceBundleKey() {
- return propertyLabelResourceBundleKey;
- }
-
- public void setPropertyLabelResourceBundleKey(String propertyLabelResourceBundleKey) {
- this.propertyLabelResourceBundleKey = propertyLabelResourceBundleKey;
- }
-
- public String getHelpResourceBundleKey() {
- return helpResourceBundleKey;
- }
-
- public void setHelpResourceBundleKey(String helpResourceBundleKey) {
- this.helpResourceBundleKey = helpResourceBundleKey;
- }
-
- public String getPropertyLabel() {
- return getI18nMsg().getMsg(getPropertyLabelResourceBundleKey());
- }
-
- public String getHelp() {
- return getI18nMsg().getMsg(getHelpResourceBundleKey());
- }
-
- private Msg getI18nMsg() {
- if (i18nMsg == null) {
- i18nMsg = new Msg(InstallerI18NResourceKeys.BUNDLE_BASE_NAME, getLocale());
- }
-
- return i18nMsg;
- }
-
- /**
- * Return the locale of the user who submitted the current request.
- *
- * @return locale
- */
- private Locale getLocale() {
- return FacesContext.getCurrentInstance().getViewRoot().getLocale();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- PropertyItem that = (PropertyItem) o;
-
- if (propertyName != null ? !propertyName.equals(that.propertyName) : that.propertyName != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return propertyName != null ? propertyName.hashCode() : 0;
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItemWithValue.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItemWithValue.java
deleted file mode 100644
index 92b599d..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItemWithValue.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class PropertyItemWithValue {
- private PropertyItem itemDefinition;
- private String value;
-
- public PropertyItemWithValue(PropertyItem itemDefinition, String value) {
- setItemDefinition(itemDefinition);
- setValue(value);
- }
-
- public PropertyItem getItemDefinition() {
- return itemDefinition;
- }
-
- public void setItemDefinition(PropertyItem itemDefinition) {
- this.itemDefinition = itemDefinition;
- }
-
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the property's value. If the given value is null or empty,
- * a default will be assigned depending on the property's type.
- *
- * @param value the new property value
- */
- public void setValue(String value) {
- if ((value == null) || (value.trim().length() <= 0)) {
- Class<?> propertyType = this.itemDefinition.getPropertyType();
-
- if (Boolean.class.isAssignableFrom(propertyType)) {
- value = Boolean.FALSE.toString();
- } else if (Number.class.isAssignableFrom(propertyType)) {
- value = "0";
- } else if (InetAddress.class.isAssignableFrom(propertyType)) {
- try {
- InetAddress.getLocalHost().getHostAddress();
- } catch (UnknownHostException e) {
- value = "127.0.0.1";
- }
- } else {
- value = "";
- }
- }
-
- this.value = value;
- }
-
- /**
- * Sets the property's value. No matter what value is, it will
- * be stored as-is. See {@link #setValue(String)} for different behavior.
- *
- * @param value the new value
- */
- public void setRawValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return this.itemDefinition.getPropertyName() + "=" + this.value;
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
deleted file mode 100644
index 94b1c81..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
+++ /dev/null
@@ -1,1324 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.helper.ProjectHelper2;
-
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.security.auth.login.XMLLoginConfigMBean;
-import org.jboss.system.server.ServerConfig;
-
-import org.rhq.core.db.DatabaseType;
-import org.rhq.core.db.DatabaseTypeFactory;
-import org.rhq.core.db.DbUtil;
-import org.rhq.core.db.H2DatabaseType;
-import org.rhq.core.db.OracleDatabaseType;
-import org.rhq.core.db.PostgresqlDatabaseType;
-import org.rhq.core.db.SQLServerDatabaseType;
-import org.rhq.core.db.setup.DBSetup;
-import org.rhq.core.util.PropertiesFileUpdate;
-import org.rhq.core.util.jdbc.JDBCUtil;
-import org.rhq.core.util.stream.StreamUtil;
-import org.rhq.enterprise.communications.util.SecurityUtil;
-
-/**
- * Finds out information about the RHQ Server and the JBossAS server it is running in. It can also be used to modify
- * things about the RHQ Server, such as the names of the deployment artifacts.
- *
- * @author John Mazzitelli
- */
-@SuppressWarnings("deprecation")
-public class ServerInformation {
- private static final Log LOG = LogFactory.getLog(ServerInformation.class);
-
- private static final String DEPLOYED_EAR_FILENAME = "rhq.ear";
- private static final String UNDEPLOYED_EAR_FILENAME = DEPLOYED_EAR_FILENAME + ".rej";
- private static final String DEPLOYED_DS_FILENAME = "rhq-ds.xml";
- private static final String UNDEPLOYED_POSTGRES_DS_FILENAME = DEPLOYED_DS_FILENAME + ".postgres.rej";
- private static final String UNDEPLOYED_ORACLE_DS_FILENAME = DEPLOYED_DS_FILENAME + ".oracle.rej";
- private static final String UNDEPLOYED_H2_DS_FILENAME = DEPLOYED_DS_FILENAME + ".h2.rej";
- private static final String UNDEPLOYED_SQLSERVER_DS_FILENAME = DEPLOYED_DS_FILENAME + ".sqlserver.rej";
- private static final String DEPLOYED_EMBEDDED_AGENT_FILENAME = "rhq-agent.sar";
- private static final String UNDEPLOYED_EMBEDDED_AGENT_FILENAME = DEPLOYED_EMBEDDED_AGENT_FILENAME + ".rej";
- private static final String DEPLOYED_MAIL_SERVICE_FILENAME = "mail-service.xml";
- private static final String UNDEPLOYED_MAIL_SERVICE_FILENAME = DEPLOYED_MAIL_SERVICE_FILENAME + ".rej";
- private static final String DEPLOYED_MDB_SERVICE_FILENAME = "rhq-mdb-service.xml";
- private static final String UNDEPLOYED_MDB_SERVICE_FILENAME = DEPLOYED_MDB_SERVICE_FILENAME + ".rej";
- private static final String DEPLOYED_JMS_FILENAME = "jms";
- private static final String UNDEPLOYED_POSTGRES_JMS_FILENAME = "jms-postgres.rej";
- private static final String UNDEPLOYED_ORACLE_JMS_FILENAME = "jms-oracle.rej";
- private static final String UNDEPLOYED_H2_JMS_FILENAME = "jms-h2.rej";
- private static final String UNDEPLOYED_SQLSERVER_JMS_FILENAME = "jms-sqlserver.rej";
- private static final String SERVER_PROPERTIES_FILENAME = "rhq-server.properties";
- private static final String PRODUCT_INFO_PROPERTIES_RESOURCE_PATH = "org/rhq/enterprise/installer/ProductInfo.properties";
- private static final String JON_UNSUPPORTED_FEATURES_ENABLED_SYSPROP = "jon.unsupportedFeaturesEnabled";
-
- private MBeanServer mbeanServer = null;
- private File deployDirectory = null;
- private File binDirectory = null;
- private File logDirectory = null;
- private File dataDirectory = null;
- private File confDirectory = null;
- private Properties productInfo = null;
-
- public enum Product {
- RHQ, JON
- }
-
- public ServerInformation() {
- // This is called both within the context of the GUI and the auto-install startup servlet.
- // Make sure you don't do anything that shouldn't be done from within the startup servlet.
- }
-
- /**
- * Returns <code>true</code> if the given set of properties provides settings that allow for a successful database
- * connection. If <code>props</code> is <code>null</code>, it will use the server properties from
- * {@link #getServerProperties()}.
- *
- * @param props set of properties where the connection information is found
- *
- * @return <code>true</code> if the database can be connected to
- */
- public boolean isDatabaseConnectionValid(Properties props) {
- if (props == null) {
- props = getServerProperties();
- }
-
- String jdbcUrl = props.getProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, "-unknown-");
- String userName = props.getProperty(ServerProperties.PROP_DATABASE_USERNAME, "-unknown-");
- String password = props.getProperty(ServerProperties.PROP_DATABASE_PASSWORD, "-unknown-");
-
- return DbUtil.ping(jdbcUrl, userName, password);
- }
-
- /**
- * Call this when you need to confirm that the database is supported.
- *
- * @param props set of properties where the connection information is found
- *
- * @throws Exception if the database is not supported
- */
- public void ensureDatabaseIsSupported(Properties props) throws Exception {
- Connection conn = null;
- DatabaseType db = null;
-
- try {
- conn = getDatabaseConnection(props);
- db = DatabaseTypeFactory.getDatabaseType(conn);
-
- String version = db.getVersion();
-
- if (DatabaseTypeFactory.isPostgres(db)) {
- if (version.startsWith("7") || version.equals("8") || version.startsWith("8.0")
- || version.startsWith("8.1")) {
- throw new Exception("Unsupported PostgreSQL [" + db + "]");
- }
- } else if (DatabaseTypeFactory.isOracle(db)) {
- if (version.startsWith("8") || version.startsWith("9")) {
- throw new Exception("Unsupported Oracle [" + db + "]");
- }
- } else if (DatabaseTypeFactory.isH2(db)) {
- if (version.startsWith("1.0")) {
- throw new Exception("Unsupported H2 [" + db + "]");
- }
- } else if (DatabaseTypeFactory.isSQLServer(db)) {
- if (version.startsWith("2000")) {
- throw new Exception("Unsupported SQL Server [" + db + "]");
- }
- } else {
- throw new Exception("Unsupported DB [" + db + "]");
- }
-
- LOG.info("Database is supported: " + db);
- } finally {
- if (db != null) {
- db.closeConnection(conn);
- }
- }
-
- return;
- }
-
- /**
- * Returns <code>true</code> if the database already has the database schema created for it. It will not be known
- * what version of schema or if its the latest, all this method tells you is that some RHQ database schema exists.
- *
- * <p>The given set of properties provides settings that allow for a successful database connection. If <code>
- * props</code> is <code>null</code>, it will use the server properties from {@link #getServerProperties()}.</p>
- *
- * <p>Do not call this method unless {@link #isDatabaseConnectionValid(Properties)} is <code>true</code>.</p>
- *
- * @param props set of properties where the connection information is found
- *
- * @return <code>true</code> if the database can be connected to
- *
- * @throws Exception if failed to communicate with the database
- */
- public boolean isDatabaseSchemaExist(Properties props) throws Exception {
- Connection conn = getDatabaseConnection(props);
- DatabaseType db = DatabaseTypeFactory.getDatabaseType(conn);
-
- try {
- return db.checkTableExists(conn, "RHQ_PRINCIPAL");
- } catch (IllegalStateException e) {
- return false;
- } finally {
- db.closeConnection(conn);
- }
- }
-
- /**
- * This will create the database schema in the database. <code>props</code> define the connection to the database -
- * see {@link #isDatabaseConnectionValid(Properties)}.
- *
- * <p>Note that if the {@link #isDatabaseSchemaExist(Properties) schema already exists}, it will be purged of all
- * data/tables and recreated.</p>
- *
- * @param props
- *
- * @throws Exception if failed to create the new schema for some reason
- */
- public void createNewDatabaseSchema(Properties props) throws Exception {
- if (props == null) {
- props = getServerProperties();
- }
-
- String jdbcUrl = props.getProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, "-unknown-");
- String userName = props.getProperty(ServerProperties.PROP_DATABASE_USERNAME, "-unknown-");
- String password = props.getProperty(ServerProperties.PROP_DATABASE_PASSWORD, "-unknown-");
-
- try {
- // extract the dbsetup files which are located in the dbutils jar
- String dbsetupSchemaXmlFile = extractDatabaseXmlFile("db-schema-combined.xml", props);
- String dbsetupDataXmlFile = extractDatabaseXmlFile("db-data-combined.xml", props);
-
- // first uninstall any old existing schema, then create the tables then insert the data
- DBSetup dbsetup = new DBSetup(jdbcUrl, userName, password);
- dbsetup.uninstall(dbsetupSchemaXmlFile);
- dbsetup.setup(dbsetupSchemaXmlFile);
- dbsetup.setup(dbsetupDataXmlFile, null, true, false);
- } catch (Exception e) {
- LOG.fatal("Cannot install the database schema - " + getProduct() + " Server will not run properly.", e);
- throw e;
- }
-
- return;
- }
-
- /**
- * This will update an existing database schema so it can be upgraded to the latest schema version. <code>
- * props</code> define the connection to the database - see {@link #isDatabaseConnectionValid(Properties)}.
- *
- * <p>Note that if the {@link #isDatabaseSchemaExist(Properties) schema does not already exist}, errors will
- * occur.</p>
- *
- * @param props
- *
- * @throws Exception if the upgrade failed for some reason
- */
- public void upgradeExistingDatabaseSchema(Properties props) throws Exception {
- if (props == null) {
- props = getServerProperties();
- }
-
- String jdbcUrl = props.getProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, "-unknown-");
- String userName = props.getProperty(ServerProperties.PROP_DATABASE_USERNAME, "-unknown-");
- String password = props.getProperty(ServerProperties.PROP_DATABASE_PASSWORD, "-unknown-");
- File logfile = new File(getLogDirectory(), "rhq-installer-dbupgrade.log");
-
- logfile.delete(); // do not keep logs from previous dbupgrade runs
-
- try {
- // extract the dbupgrade ANT script which is located in the dbutils jar
- String dbupgradeXmlFile = extractDatabaseXmlFile("db-upgrade.xml", props);
-
- Properties antProps = new Properties();
- antProps.setProperty("jdbc.url", jdbcUrl);
- antProps.setProperty("jdbc.user", userName);
- antProps.setProperty("jdbc.password", password);
- antProps.setProperty("target.schema.version", "LATEST");
-
- startAnt(new File(dbupgradeXmlFile), "db-ant-tasks.properties", antProps, logfile);
- } catch (Exception e) {
- LOG.fatal("Cannot upgrade the database schema - " + getProduct() + " Server will not run properly.", e);
- throw e;
- }
-
- return;
- }
-
- /**
- * Gets the current set of properties currently configured for the RHQ Server.
- *
- * @return current configuration properties
- *
- * @throws RuntimeException if failed to read the properties file
- */
- public Properties getServerProperties() {
- File file = getServerPropertiesFile();
-
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(file);
- Properties props = new Properties();
- props.load(fis);
- return props;
- } catch (Exception e) {
- throw new RuntimeException("Cannot load configuration from [" + file + "]. Cause:" + e, e);
- } finally {
- JDBCUtil.safeClose(fis);
- }
- }
-
- /**
- * Writes the given properties to the RHQ Server properties file and also sets them as system properties.
- *
- * @param props the new properties
- *
- * @throws RuntimeException if failed to write the file
- */
- public void setServerProperties(Properties props) {
- clearNullProperties(props);
-
- File file = getServerPropertiesFile();
-
- try {
- PropertiesFileUpdate updater = new PropertiesFileUpdate(file.getAbsolutePath());
- updater.update(props);
- } catch (Exception e) {
- throw new RuntimeException("Cannot store configuration to [" + file + "]. Cause:" + e, e);
- }
-
- // we need to put them as system properties now so when we hot deploy,
- // the replacement variables in the config files pick up the new values
- for (Map.Entry<Object, Object> entry : props.entrySet()) {
- System.setProperty(entry.getKey().toString(), entry.getValue().toString());
- }
-
- return;
- }
-
- /**
- * This will move the RHQ Server deployment artifacts such that they either get hot-deployed or hot-undeployed in
- * the JBossAS server. If <code>deploy</code> is <code>true</code>, this ensures the RHQ Server deployment artifacts
- * (e.g. the EAR and its data source) are deployed so they can run. If <code>deploy</code> is <code>false</code>,
- * the caller is saying he wants the RHQ Server to be undeployed so it doesn't run anymore.
- *
- * @param deploy <code>true</code> means the RHQ Server should be deployed; otherwise, its deployment artifacts
- * should be undeployed
- *
- * @throws RuntimeException if failed to move one or more artifacts
- */
- public void moveDeploymentArtifacts(boolean deploy) {
- try {
- // order is important here - do agent and data source first, then JMS, then alert cache, and then ear last
-
- // MAIL SERVICE
- File mail = getMailServiceFile(!deploy);
- File mailRenameTo = getMailServiceFile(deploy);
- if (!mailRenameTo.exists()) {
- mail.renameTo(mailRenameTo);
- }
-
- // EMBEDDED AGENT
- // if we are to deploy, then we need to rename the undeployed files; and vice versa
- File agent = getEmbeddedAgentFile(!deploy);
- File agentRenameTo = getEmbeddedAgentFile(deploy);
- if (!agentRenameTo.exists()) {
- agent.renameTo(agentRenameTo);
- }
-
- // DATA SOURCE
- // we leave the undeployed versions - there is one per supported database
- // to undeploy, we just delete the deployed datasource file
- // to deploy, we copy one of the undeployed versions for the DB to be used
- File ds = getDataSourceFile(true);
- if (deploy) {
- File undeployedDataSource = getDataSourceFile(false); // gets the DB specific one
- copySingleFile(undeployedDataSource, ds);
- } else {
- // being told to undeploy - delete the deployed datasource file if exists
- deleteFile(ds);
- }
-
- // JMS
- // we leave the undeployed versions - there is one per supported database
- // to undeploy, we just delete the deployed JMS directory
- // to deploy, we copy one of the undeployed version for the DB to be used
- File jms = getJmsFile(true);
- if (deploy) {
- File undeployedJms = getJmsFile(false); // gets the DB specific one
- copyDirectory(undeployedJms, jms);
- } else {
- // being told to undeploy - delete the deployed JMS directory if exists
- deleteFile(jms);
- }
-
- // MDB SERVICE
- File mdb = getMdbServiceFile(!deploy);
- File mdbRenameTo = getMdbServiceFile(deploy);
- if (!mdbRenameTo.exists()) {
- mdb.renameTo(mdbRenameTo);
- }
-
- // EAR
- File ear = getEarFile(!deploy);
- File earRenameTo = getEarFile(deploy);
- if (!earRenameTo.exists()) {
- ear.renameTo(earRenameTo);
- }
- } catch (Exception e) {
- throw new RuntimeException("Failed to move deployment artifacts. Cause: " + e, e);
- }
-
- return;
- }
-
- /**
- * Returns <code>true</code> if the RHQ Server deployment artifacts are fully deployed. <code>false</code> if the
- * installer needs to perform some work to finish the installation.
- *
- * @return installation status of RHQ Server
- */
- public boolean isFullyDeployed() {
- File ear = getEarFile(true);
- File agent = getEmbeddedAgentFile(true);
- File jms = getJmsFile(true);
- File ds = getDataSourceFile(true);
- File mail = getMailServiceFile(true);
- File alert = getMdbServiceFile(true);
-
- return ds.exists() && jms.exists() && ear.exists() && agent.exists() && mail.exists() && alert.exists();
- }
-
- private File getEarFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file = new File(deployDir, deployed ? DEPLOYED_EAR_FILENAME : UNDEPLOYED_EAR_FILENAME);
- return file;
- }
-
- private File getMailServiceFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file = new File(deployDir, deployed ? DEPLOYED_MAIL_SERVICE_FILENAME : UNDEPLOYED_MAIL_SERVICE_FILENAME);
- return file;
- }
-
- private File getMdbServiceFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file = new File(deployDir, deployed ? DEPLOYED_MDB_SERVICE_FILENAME : UNDEPLOYED_MDB_SERVICE_FILENAME);
- return file;
- }
-
- private File getEmbeddedAgentFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file = new File(deployDir, deployed ? DEPLOYED_EMBEDDED_AGENT_FILENAME
- : UNDEPLOYED_EMBEDDED_AGENT_FILENAME);
- return file;
- }
-
- private File getDataSourceFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file;
-
- if (deployed) {
- file = new File(deployDir, DEPLOYED_DS_FILENAME);
- } else {
- String db = getServerProperties().getProperty(ServerProperties.PROP_DATABASE_TYPE);
- if (db.toLowerCase().indexOf("postgres") > -1) {
- file = new File(deployDir, UNDEPLOYED_POSTGRES_DS_FILENAME);
- } else if (db.toLowerCase().indexOf("oracle") > -1) {
- file = new File(deployDir, UNDEPLOYED_ORACLE_DS_FILENAME);
- } else if (db.toLowerCase().indexOf("h2") > -1) {
- file = new File(deployDir, UNDEPLOYED_H2_DS_FILENAME);
- } else if (db.toLowerCase().indexOf("sqlserver") > -1) {
- file = new File(deployDir, UNDEPLOYED_SQLSERVER_DS_FILENAME);
- } else {
- throw new RuntimeException("Unsupported database: " + db);
- }
- }
-
- return file;
- }
-
- private File getJmsFile(boolean deployed) {
- File deployDir = getDeployDirectory();
- File file;
-
- if (deployed) {
- file = new File(deployDir, DEPLOYED_JMS_FILENAME);
- } else {
- String db = getServerProperties().getProperty(ServerProperties.PROP_DATABASE_TYPE);
- if (db.toLowerCase().indexOf("postgres") > -1) {
- file = new File(deployDir, UNDEPLOYED_POSTGRES_JMS_FILENAME);
- } else if (db.toLowerCase().indexOf("oracle") > -1) {
- file = new File(deployDir, UNDEPLOYED_ORACLE_JMS_FILENAME);
- } else if (db.toLowerCase().indexOf("h2") > -1) {
- file = new File(deployDir, UNDEPLOYED_H2_JMS_FILENAME);
- } else if (db.toLowerCase().indexOf("sqlserver") > -1) {
- file = new File(deployDir, UNDEPLOYED_SQLSERVER_JMS_FILENAME);
- } else {
- throw new RuntimeException("Unsupported database: " + db);
- }
- }
-
- return file;
- }
-
- private void clearNullProperties(Properties props) {
- // some properties, if blank, must be removed so their defaults are picked up
-
- String bindAddr = props.getProperty(ServerProperties.PROP_SERVER_BIND_ADDRESS);
- if ((bindAddr != null) && (bindAddr.trim().length() == 0)) {
- props.remove(ServerProperties.PROP_SERVER_BIND_ADDRESS);
- }
-
- return;
- }
-
- private File getServerPropertiesFile() {
- File binDir = getBinDirectory();
- File file = new File(binDir, SERVER_PROPERTIES_FILENAME);
- return file;
- }
-
- private File getDeployDirectory() {
- if (deployDirectory == null) {
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, ServerConfig.class, false);
-
- deployDirectory = new File(((ServerConfig) mbean).getServerHomeDir(), "deploy");
- }
-
- return deployDirectory;
- }
-
- private File getBinDirectory() {
- if (binDirectory == null) {
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, ServerConfig.class, false);
-
- File homeDir = ((ServerConfig) mbean).getHomeDir();
- binDirectory = new File(homeDir.getParentFile(), "bin");
- }
-
- return binDirectory;
- }
-
- File getLogDirectory() {
- if (logDirectory == null) {
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, ServerConfig.class, false);
-
- File homeDir = ((ServerConfig) mbean).getHomeDir();
- logDirectory = new File(homeDir.getParentFile(), "logs");
- logDirectory.mkdirs(); // just in case it doesn't exist yet, let's create it now
- }
-
- return logDirectory;
- }
-
- void setLogDirectory(File dir) {
- logDirectory = dir;
- }
-
- public File getDataDirectory() {
- if (dataDirectory == null) {
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, ServerConfig.class, false);
-
- dataDirectory = new File(((ServerConfig) mbean).getServerHomeDir(), "data");
- dataDirectory.mkdirs(); // just in case it doesn't exist yet, let's create it now
- }
-
- return dataDirectory;
- }
-
- private File getConfDirectory() {
- if (confDirectory == null) {
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, ServerConfig.class, false);
-
- confDirectory = new File(((ServerConfig) mbean).getServerHomeDir(), "conf");
- }
-
- return confDirectory;
- }
-
- private MBeanServer getMBeanServer() {
- if (mbeanServer == null) {
- mbeanServer = MBeanServerLocator.locateJBoss();
- }
-
- return mbeanServer;
- }
-
- private void deleteFile(File file) {
- if (file != null) {
- if (file.isDirectory()) {
- File[] doomedFiles = file.listFiles();
- if (doomedFiles != null) {
- for (File doomedFile : doomedFiles) {
- deleteFile(doomedFile); // call this method recursively
- }
- }
- } else {
- file.delete();
- }
- }
-
- return;
- }
-
- private void copyDirectory(File from, File to) throws Exception {
- to.mkdirs();
-
- File[] children = from.listFiles();
-
- for (File fromChild : children) {
- File toChild = new File(to, fromChild.getName());
- if (fromChild.isDirectory()) {
- copyDirectory(fromChild, toChild);
- } else {
- copySingleFile(fromChild, toChild);
- }
- }
-
- return;
- }
-
- private void copySingleFile(File from, File to) throws Exception {
- FileInputStream fis = new FileInputStream(from);
- FileOutputStream fos = new FileOutputStream(to);
-
- try {
- byte[] buf = new byte[1024];
- int i = 0;
- while ((i = fis.read(buf)) != -1) {
- fos.write(buf, 0, i);
- }
- } finally {
- JDBCUtil.safeClose(fis);
- JDBCUtil.safeClose(fos);
- }
-
- return;
- }
-
- /**
- * Returns a database connection with the given set of properties providing the settings that allow for a successful
- * database connection. If <code>props</code> is <code>null</code>, it will use the server properties from
- * {@link #getServerProperties()}.
- *
- * @param props set of properties where the connection information is found
- *
- * @return the database connection
- *
- * @throws SQLException if cannot successfully connect to the database
- */
- public Connection getDatabaseConnection(Properties props) throws SQLException {
- if (props == null) {
- props = getServerProperties();
- }
-
- String jdbcUrl = props.getProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, "-unknown-");
- String userName = props.getProperty(ServerProperties.PROP_DATABASE_USERNAME, "-unknown-");
- String password = props.getProperty(ServerProperties.PROP_DATABASE_PASSWORD, "-unknown-");
-
- return DbUtil.getConnection(jdbcUrl, userName, password);
- }
-
- /**
- * Takes the named XML file from the classloader and writes the file to the log directory. This is meant to extract
- * the schema/data xml files from the dbutils jar file. It can also be used to extract the db upgrade XML file.
- *
- * @param xmlFileName the name of the XML file, as found in the classloader
- * @param props properties whose values are used to replace the replacement strings found in the XML file
- *
- * @return the absolute path to the extracted file
- *
- * @throws IOException if failed to extract the file to the log directory
- */
- private String extractDatabaseXmlFile(String xmlFileName, Properties props) throws IOException {
- // first slurp the file contents in memory
- InputStream resourceInStream = this.getClass().getClassLoader().getResourceAsStream(xmlFileName);
- ByteArrayOutputStream contentOutStream = new ByteArrayOutputStream();
- StreamUtil.copy(resourceInStream, contentOutStream);
-
- // now replace their replacement strings with values from the properties
- String content = contentOutStream.toString();
- content = content.replaceAll("@@@LARGE_TABLESPACE_FOR_DATA@@@", "DEFAULT");
- content = content.replaceAll("@@@LARGE_TABLESPACE_FOR_INDEX@@@", "DEFAULT");
- content = content.replaceAll("@@@ADMINUSERNAME@@@", "rhqadmin");
- content = content.replaceAll("@@@ADMINPASSWORD@@@", "x1XwrxKuPvYUILiOnOZTLg=="); // rhqadmin
- content = content.replaceAll("@@@ADMINEMAIL@@@", props.getProperty(ServerProperties.PROP_EMAIL_FROM_ADDRESS));
- content = content.replaceAll("@@@BASEURL@@@", "http://" + ServerProperties.getValidServerBindAddress(props)
- + ":" + ServerProperties.getHttpPort(props) + "/");
- content = content.replaceAll("@@@JAASPROVIDER@@@", "JDBC");
- content = content.replaceAll("@@@LDAPURL@@@", "ldap://localhost/");
- content = content.replaceAll("@@@LDAPPROTOCOL@@@", "");
- content = content.replaceAll("@@@LDAPLOGINPROP@@@", "cn");
- content = content.replaceAll("@@@LDAPBASEDN@@@", "o=JBoss,c=US");
- content = content.replaceAll("@@@LDAPSEARCHFILTER@@@", "");
- content = content.replaceAll("@@@LDAPBINDDN@@@", "");
- content = content.replaceAll("@@@LDAPBINDPW@@@", "");
- content = content.replaceAll("@@@MULTICAST_ADDR@@@", "");
- content = content.replaceAll("@@@MULTICAST_PORT@@@", "");
-
- // we now have the finished XML content - write out the file to the log directory
- File xmlFile = new File(getLogDirectory(), xmlFileName);
- FileOutputStream xmlFileOutStream = new FileOutputStream(xmlFile);
- ByteArrayInputStream contentInStream = new ByteArrayInputStream(content.getBytes());
- StreamUtil.copy(contentInStream, xmlFileOutStream);
-
- return xmlFile.getAbsolutePath();
- }
-
- /**
- * Launches ANT and runs the default target in the given build file.
- *
- * @param buildFile the build file that ANT will run
- * @param customTaskDefs the properties file found in classloader that contains all the taskdef definitions
- * @param properties set of properties to set for the ANT task to access
- * @param logFile where ANT messages will be logged (in addition to the app server's log file)
- *
- * @throws RuntimeException
- */
- private void startAnt(File buildFile, String customTaskDefs, Properties properties, File logFile) {
- PrintWriter logFileOutput = null;
-
- try {
- logFileOutput = new PrintWriter(new FileOutputStream(logFile));
-
- ClassLoader classLoader = getClass().getClassLoader();
-
- Properties taskDefs = new Properties();
- InputStream taskDefsStream = classLoader.getResourceAsStream(customTaskDefs);
- try {
- taskDefs.load(taskDefsStream);
- } finally {
- taskDefsStream.close();
- }
-
- Project project = new Project();
- project.setCoreLoader(classLoader);
- project.init();
-
- for (Map.Entry<Object, Object> property : properties.entrySet()) {
- project.setProperty(property.getKey().toString(), property.getValue().toString());
- }
-
- // notice we add our listener after we set the properties - we do not want the password to be in the log file
- // our dbupgrade script will echo the property settings, so we can still get the other values
- project.addBuildListener(new LoggerAntBuildListener(logFileOutput));
-
- for (Map.Entry<Object, Object> taskDef : taskDefs.entrySet()) {
- project.addTaskDefinition(taskDef.getKey().toString(),
- Class.forName(taskDef.getValue().toString(), true, classLoader));
- }
-
- new ProjectHelper2().parse(project, buildFile);
- project.executeTarget(project.getDefaultTarget());
- } catch (Exception e) {
- throw new RuntimeException("Cannot run ANT on script [" + buildFile + "]. Cause: " + e, e);
- } finally {
- if (logFileOutput != null) {
- logFileOutput.close();
- }
- }
- }
-
- /**
- * Clean up messages in the JMS message table. Make sure you call this when no other Servers
- * are communicating with the database, otherwise, its possible in-flight messages will get lost
- * or go into a bad state.
- *
- * @param props
- */
- public void cleanJmsTables(Properties props) {
-
- Connection conn = null;
- Statement stm = null;
-
- try {
- conn = getDatabaseConnection(props);
- stm = conn.createStatement();
- stm.executeUpdate("DELETE FROM JMS_MESSAGES"); // TODO: we should do truncate, no?
- } catch (SQLException e) {
- LOG.info("Was not able to delete existing JMS messages: " + e.getMessage());
- } finally {
- try {
- if (null != stm)
- stm.close();
- } catch (Exception e) {
- // best effort only
- }
- try {
- if (null != conn)
- conn.close();
- } catch (Exception e) {
- // best effort only
- }
- }
- }
-
- public void restartLoginConfig() throws Exception {
-
- MBeanServer mbs = getMBeanServer();
- ObjectName name = ObjectNameFactory.create("jboss.security:service=XMLLoginConfig");
- Object mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name, XMLLoginConfigMBean.class, false);
-
- XMLLoginConfigMBean conf = (XMLLoginConfigMBean) mbean;
- // DISABLING SINCE THIS INSTALLER-WAR MODULE ISN'T USED FOR AS7 ANYWAY
- // conf.stop();
- // conf.start();
- }
-
- public static class Server {
- public static final String DEFAULT_AFFINITY_GROUP = "";
- public static final int DEFAULT_ENDPOINT_PORT = 7080;
- public static final int DEFAULT_ENDPOINT_SECURE_PORT = 7443;
-
- private String name;
- private String endpointAddress;
- private int endpointPort;
- private int endpointSecurePort;
- private String affinityGroup;
-
- public Server(String name, String endpointAddress, int port, int securePort, String affinityGroup) {
- this.name = name;
- this.endpointAddress = endpointAddress;
- this.endpointPort = port;
- this.endpointSecurePort = securePort;
- this.affinityGroup = affinityGroup;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- if ((null != name) && (!"".equals(name.trim()))) {
- this.name = name;
- }
- }
-
- public String getEndpointAddress() {
- return endpointAddress;
- }
-
- public void setEndpointAddress(String endpointAddress) {
- if ((null != endpointAddress) && (!"".equals(endpointAddress.trim()))) {
- this.endpointAddress = endpointAddress;
- }
- }
-
- public int getEndpointPort() {
- return endpointPort;
- }
-
- public void setEndpointPort(int endpointPort) {
- this.endpointPort = endpointPort;
- }
-
- public String getEndpointPortString() {
- return (String.valueOf(this.endpointPort));
- }
-
- public void setEndpointPortString(String endpointPort) {
- try {
- this.endpointPort = Integer.valueOf(endpointPort).intValue();
- } catch (NumberFormatException e) {
- LOG.debug("Failed to set port with invalid number: " + endpointPort);
- }
- }
-
- public int getEndpointSecurePort() {
- return endpointSecurePort;
- }
-
- public void setEndpointSecurePort(int endpointSecurePort) {
- this.endpointSecurePort = endpointSecurePort;
- }
-
- public String getEndpointSecurePortString() {
- return (String.valueOf(this.endpointSecurePort));
- }
-
- public void setEndpointSecurePortString(String endpointSecurePort) {
- try {
- this.endpointSecurePort = Integer.valueOf(endpointSecurePort).intValue();
- } catch (NumberFormatException e) {
- LOG.debug("Failed to set secure port with invalid number: " + endpointSecurePort);
- }
- }
-
- public String getAffinityGroup() {
- return affinityGroup;
- }
-
- public void setAffinityGroup(String affinityGroup) {
- if ((null != affinityGroup) && (!"".equals(affinityGroup.trim()))) {
- this.affinityGroup = affinityGroup;
- }
- }
-
- @Override
- public String toString() {
- return "[name=" + name + " address=" + endpointAddress + " port=" + endpointPort + " secureport="
- + endpointSecurePort + " affinitygroup=" + affinityGroup + "]";
- }
- }
-
- /**
- * Get the list of existing servers from an existing RHQ schema.
- *
- * <p>The given set of properties provides settings that allow for a successful database connection. If <code>
- * props</code> is <code>null</code>, it will use the server properties from {@link #getServerProperties()}.</p>
- *
- * <p>Do not call this method unless {@link #isDatabaseConnectionValid(Properties)} is <code>true</code>.</p>
- *
- * @param props set of properties where the connection information is found
- *
- * @return List of server names registered in the database. Empty list if the table does not exist or there are no entries in the table.
- *
- * @throws Exception if failed to communicate with the database
- */
- public List<String> getServerNames(Properties props) throws Exception {
- DatabaseType db = null;
- Connection conn = null;
- Statement stm = null;
- ResultSet rs = null;
- List<String> result = new ArrayList<String>();
-
- try {
- conn = getDatabaseConnection(props);
- db = DatabaseTypeFactory.getDatabaseType(conn);
-
- if (db.checkTableExists(conn, "rhq_server")) {
-
- stm = conn.createStatement();
- rs = stm.executeQuery("SELECT name FROM rhq_server ORDER BY name asc");
-
- while (rs.next()) {
- result.add(rs.getString(1));
- }
- }
- } catch (IllegalStateException e) {
- // table does not exist
- } catch (SQLException e) {
- LOG.info("Unable to fetch existing server info: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeJDBCObjects(conn, stm, rs);
- }
- }
-
- return result;
- }
-
- public Product getProduct() {
- Properties productInfo = getProductInfo();
- return (productInfo.getProperty("shortName").equals("JON")) ? Product.JON : Product.RHQ;
- }
-
- private Properties getProductInfo() {
- if (this.productInfo == null) {
- ClassLoader classLoader = this.getClass().getClassLoader();
- InputStream inputStream = classLoader.getResourceAsStream(PRODUCT_INFO_PROPERTIES_RESOURCE_PATH);
- if (inputStream != null) {
- Properties props = new Properties();
- try {
- try {
- props.load(inputStream);
- } finally {
- inputStream.close();
- }
- } catch (IOException e) {
- throw new IllegalStateException(
- "Failed to load product info properties from class loader resource ["
- + PRODUCT_INFO_PROPERTIES_RESOURCE_PATH + "].");
- }
-
- return props;
- } else {
- throw new IllegalStateException("Failed to find class loader resource ["
- + PRODUCT_INFO_PROPERTIES_RESOURCE_PATH + "].");
- }
- }
-
- return this.productInfo;
- }
-
- public boolean isUnsupportedJonFeaturesEnabled() {
- return Boolean.getBoolean(JON_UNSUPPORTED_FEATURES_ENABLED_SYSPROP);
- }
-
- private int getAffinityGroupId(DatabaseType db, Connection conn, String affinityGroup) {
- PreparedStatement stm = null;
- ResultSet rs = null;
- int result = -1;
-
- if ((null == affinityGroup) || ServerInformation.Server.DEFAULT_AFFINITY_GROUP.equals(affinityGroup))
- return result;
-
- try {
- stm = conn.prepareStatement("SELECT id FROM rhq_affinity_group WHERE name = ?");
- stm.setString(1, affinityGroup.trim());
- rs = stm.executeQuery();
-
- if (rs.next())
- result = rs.getInt(1);
-
- } catch (SQLException e) {
- LOG.info("Unable to get affinity group id: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
-
- return result;
- }
-
- private String getAffinityGroup(DatabaseType db, Connection conn, String serverName) {
- PreparedStatement stm = null;
- ResultSet rs = null;
- String result = null;
-
- if (null == serverName)
- return result;
-
- try {
- stm = conn
- .prepareStatement("SELECT ag.name FROM rhq_affinity_group ag JOIN rhq_server s ON ag.id = s.affinity_group_id WHERE s.name = ?");
- stm.setString(1, serverName.trim());
- rs = stm.executeQuery();
-
- if (rs.next())
- result = rs.getString(1);
-
- } catch (SQLException e) {
- LOG.info("Unable to get affinity group name for server: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
-
- return result;
- }
-
- public String getAffinityGroupForServer(Properties props, String serverName) {
-
- DatabaseType db = null;
- Connection conn = null;
- String result = null;
-
- try {
- conn = getDatabaseConnection(props);
- db = DatabaseTypeFactory.getDatabaseType(conn);
-
- result = getAffinityGroup(db, conn, serverName);
-
- } catch (Exception e) {
- LOG.info("Unable to get affinity group for server: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeConnection(conn);
- }
- }
-
- return result;
- }
-
- private void insertAffinityGroup(DatabaseType db, Connection conn, String affinityGroup) {
- PreparedStatement stm = null;
- ResultSet rs = null;
-
- // don't insert anything if the affinity group is null or empty string
- if (null == affinityGroup) {
- return;
- }
-
- affinityGroup = affinityGroup.trim();
- if ("".equals(affinityGroup)) {
- return;
- }
-
- try {
- int i = 1;
- if (db instanceof SQLServerDatabaseType) {
- stm = conn.prepareStatement("INSERT INTO rhq_affinity_group ( name ) VALUES ( ? )");
- } else if (db instanceof PostgresqlDatabaseType || db instanceof OracleDatabaseType
- || db instanceof H2DatabaseType) {
- stm = conn.prepareStatement("INSERT INTO rhq_affinity_group ( id, name ) VALUES ( ?, ? )");
- stm.setInt(i++, db.getNextSequenceValue(conn, "rhq_affinity_group", "id"));
- } else {
- throw new IllegalArgumentException("Unknown database type, can't continue: " + db);
- }
- stm.setString(i++, affinityGroup);
- stm.executeUpdate();
-
- } catch (SQLException e) {
- LOG.info("Unable to insert affinity group: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
- }
-
- private ServerInformation.Server getServer(DatabaseType db, Connection conn, String serverName) {
- PreparedStatement stm = null;
- ResultSet rs = null;
- ServerInformation.Server result = null;
-
- if (null == serverName) {
- return result;
- }
-
- try {
- stm = conn
- .prepareStatement("SELECT s.address, s.port, s.secure_port, ag.name FROM rhq_server s LEFT JOIN rhq_affinity_group ag ON ag.id = s.affinity_group_id WHERE s.name = ?");
- stm.setString(1, serverName.trim());
-
- rs = stm.executeQuery();
-
- if (rs.next()) {
- result = new ServerInformation.Server(serverName, rs.getString(1), rs.getInt(2), rs.getInt(3),
- rs.getString(4));
- }
-
- } catch (SQLException e) {
- LOG.info("Unable to get affinity group name for server: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
-
- return result;
- }
-
- public ServerInformation.Server getServerDetail(Properties props, String serverName) {
-
- DatabaseType db = null;
- Connection conn = null;
- ServerInformation.Server result = null;
-
- try {
- conn = getDatabaseConnection(props);
- db = DatabaseTypeFactory.getDatabaseType(conn);
-
- result = getServer(db, conn, serverName);
-
- } catch (Exception e) {
- LOG.info("Unable to get server detail: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeConnection(conn);
- }
- }
-
- return result;
- }
-
- private void updateServerAffinityGroup(DatabaseType db, Connection conn, String serverName, int affinityGroupId) {
- PreparedStatement stm = null;
- ResultSet rs = null;
-
- if ((affinityGroupId < 0) || (null == serverName)) {
- return;
- }
-
- try {
- stm = conn.prepareStatement("UPDATE rhq_server SET affinity_group_id = ? WHERE name = ?");
- stm.setInt(1, affinityGroupId);
- stm.setString(2, serverName);
- stm.executeUpdate();
-
- } catch (SQLException e) {
- LOG.info("Unable to set server affinity group id: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
- }
-
- private void updateOrInsertServer(DatabaseType db, Connection conn, ServerInformation.Server server) {
- PreparedStatement stm = null;
- ResultSet rs = null;
-
- if (null == server || null == server.name) {
- return;
- }
- if ("".equals(server.name.trim())) {
- return;
- }
-
- try {
- stm = conn.prepareStatement("UPDATE rhq_server SET address=?, port=?, secure_port=? WHERE name=?");
- stm.setString(1, server.endpointAddress);
- stm.setInt(2, server.endpointPort);
- stm.setInt(3, server.endpointSecurePort);
- stm.setString(4, server.name);
- if (0 == stm.executeUpdate()) {
- stm.close();
-
- // set all new servers to operation_mode=INSTALLED
- int i = 1;
- if (db instanceof SQLServerDatabaseType) {
- stm = conn.prepareStatement("INSERT INTO rhq_server " //
- + " ( name, address, port, secure_port, ctime, mtime, operation_mode, compute_power ) " //
- + "VALUES ( ?, ?, ?, ?, ?, ?, 'INSTALLED', 1 )");
- } else if (db instanceof PostgresqlDatabaseType || db instanceof OracleDatabaseType
- || db instanceof H2DatabaseType) {
- stm = conn.prepareStatement("INSERT INTO rhq_server " //
- + " ( id, name, address, port, secure_port, ctime, mtime, operation_mode, compute_power ) " //
- + "VALUES ( ?, ?, ?, ?, ?, ?, ?, 'INSTALLED', 1 )");
- stm.setInt(i++, db.getNextSequenceValue(conn, "rhq_server", "id"));
- } else {
- throw new IllegalArgumentException("Unknown database type, can't continue: " + db);
- }
-
- stm.setString(i++, server.name);
- stm.setString(i++, server.endpointAddress);
- stm.setInt(i++, server.endpointPort);
- stm.setInt(i++, server.endpointSecurePort);
- long now = System.currentTimeMillis();
- stm.setLong(i++, now);
- stm.setLong(i++, now);
- stm.executeUpdate();
- }
-
- int affinityGroupId = getAffinityGroupId(db, conn, server.getAffinityGroup());
-
- if (affinityGroupId < 0) {
- insertAffinityGroup(db, conn, server.affinityGroup);
- affinityGroupId = getAffinityGroupId(db, conn, server.affinityGroup);
- }
-
- if (affinityGroupId > 0) {
- this.updateServerAffinityGroup(db, conn, server.name, affinityGroupId);
- }
-
- } catch (SQLException e) {
- LOG.info("Unable to insert server: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeResultSet(rs);
- db.closeStatement(stm);
- }
- }
- }
-
- public void storeServer(Properties props, ServerInformation.Server server) throws Exception {
-
- DatabaseType db = null;
- Connection conn = null;
-
- try {
- conn = getDatabaseConnection(props);
- db = DatabaseTypeFactory.getDatabaseType(conn);
-
- updateOrInsertServer(db, conn, server);
-
- } catch (SQLException e) {
- LOG.info("Unable to create server entry: " + e.getMessage());
- } finally {
- if (null != db) {
- db.closeConnection(conn);
- }
- }
- }
-
- public void createKeystore(Server haServer) {
- File confDir = getConfDirectory();
- File keystore = new File(confDir, "rhq.keystore");
- File keystoreBackup = new File(confDir, "rhq.keystore.backup");
-
- // if there is one out-of-box, we want to remove it and create one with our proper CN
- if (keystore.exists()) {
- keystoreBackup.delete();
- if (!keystore.renameTo(keystoreBackup)) {
- LOG.warn("Cannot backup existing keystore - cannot generate a new cert with a proper domain name. ["
- + keystore + "] will be the keystore used by this server");
- return;
- }
- }
-
- try {
- String keystorePath = keystore.getAbsolutePath();
- String keyAlias = "RHQ";
- String domainName = "CN=" + haServer.endpointAddress + ", OU=RHQ, O=rhq-project.org, C=US";
- String keystorePassword = "RHQManagement";
- String keyPassword = keystorePassword;
- String keyAlgorithm = "rsa";
- int validity = 7300;
- SecurityUtil.createKeyStore(keystorePath, keyAlias, domainName, keystorePassword, keyPassword,
- keyAlgorithm, validity);
- LOG.info("New keystore created [" + keystorePath + "] with cert domain name of [" + domainName + "]");
- } catch (Exception e) {
- LOG.warn("Could not generate a new cert with a proper domain name, will use the original keystore");
- keystore.delete();
- if (!keystoreBackup.renameTo(keystore)) {
- LOG.warn("Failed to restore the original keystore from backup - please rename [" + keystoreBackup
- + "] to [" + keystore + "]");
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
deleted file mode 100644
index 06a3b9f..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import javax.faces.model.SelectItem;
-
-import org.rhq.enterprise.installer.i18n.InstallerI18NResourceKeys;
-
-public class ServerProperties {
- public static final String PREFIX_PROP_DATABASE = "rhq.server.database.";
- public static final String PROP_DATABASE_TYPE = PREFIX_PROP_DATABASE + "type-mapping";
- public static final String PROP_DATABASE_CONNECTION_URL = PREFIX_PROP_DATABASE + "connection-url";
- public static final String PROP_DATABASE_DRIVER_CLASS = PREFIX_PROP_DATABASE + "driver-class";
- public static final String PROP_DATABASE_USERNAME = PREFIX_PROP_DATABASE + "user-name";
- public static final String PROP_DATABASE_PASSWORD = PREFIX_PROP_DATABASE + "password";
- public static final String PROP_DATABASE_XA_DS_CLASS = PREFIX_PROP_DATABASE + "xa-datasource-class";
- public static final String PROP_DATABASE_SERVER_NAME = PREFIX_PROP_DATABASE + "server-name";
- public static final String PROP_DATABASE_PORT = PREFIX_PROP_DATABASE + "port";
- public static final String PROP_DATABASE_DB_NAME = PREFIX_PROP_DATABASE + "db-name";
- public static final String PROP_DATABASE_HIBERNATE_DIALECT = "hibernate.dialect";
- public static final String PROP_QUARTZ_DRIVER_DELEGATE_CLASS = "rhq.server.quartz.driverDelegateClass";
- public static final String PROP_QUARTZ_SELECT_WITH_LOCK_SQL = "rhq.server.quartz.selectWithLockSQL";
- public static final String PROP_QUARTZ_LOCK_HANDLER_CLASS = "rhq.server.quartz.lockHandlerClass";
-
- public static final String PROP_SERVER_BIND_ADDRESS = "jboss.bind.address";
- public static final String PROP_HTTP_PORT = "rhq.server.startup.web.http.port";
- public static final String PROP_HTTPS_PORT = "rhq.server.startup.web.https.port";
- public static final String PROP_WEB_SERVICE_PORT = "rhq.server.startup.webservice.port";
- public static final String PROP_NAMING_SERVICE_PORT = "rhq.server.startup.namingservice.port";
- public static final String PROP_NAMING_SERVICE_RMI_PORT = "rhq.server.startup.namingservice.rmiport";
- public static final String PROP_JRMP_INVOKER_RMI_PORT = "rhq.server.startup.jrmpinvoker.rmiport";
- public static final String PROP_POOLED_INVOKER_RMI_PORT = "rhq.server.startup.pooledinvoker.rmiport";
- public static final String PROP_AJP_PORT = "rhq.server.startup.ajp.port";
- public static final String PROP_UNIFIED_INVOKER_PORT = "rhq.server.startup.unifiedinvoker.port";
- public static final String PROP_ASPECT_DEPLOYER_PORT = "rhq.server.startup.aspectdeployer.bind-port";
-
- public static final String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD = "rhq.server.tomcat.security.client-auth-mode";
- public static final String PROP_TOMCAT_SECURITY_SSL_PROTOCOL = "rhq.server.tomcat.security.secure-socket-protocol";
- public static final String PROP_TOMCAT_SECURITY_ALGORITHM = "rhq.server.tomcat.security.algorithm";
- public static final String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS = "rhq.server.tomcat.security.keystore.alias";
- public static final String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME = "rhq.server.tomcat.security.keystore.file";
- public static final String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD = "rhq.server.tomcat.security.keystore.password";
- public static final String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE = "rhq.server.tomcat.security.keystore.type";
- public static final String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME = "rhq.server.tomcat.security.truststore.file";
- public static final String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD = "rhq.server.tomcat.security.truststore.password";
- public static final String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE = "rhq.server.tomcat.security.truststore.type";
-
- public static final String PROP_CONNECTOR_TRANSPORT = "rhq.communications.connector.transport";
- public static final String PROP_CONNECTOR_BIND_ADDRESS = "rhq.communications.connector.bind-address";
- public static final String PROP_CONNECTOR_BIND_PORT = "rhq.communications.connector.bind-port";
- public static final String PROP_CONNECTOR_TRANSPORT_PARAMS = "rhq.communications.connector.transport-params";
-
- public static final String PROP_AGENT_MULTICAST_DETECTOR_ENABLED = "rhq.communications.multicast-detector.enabled";
- public static final String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS = "rhq.communications.multicast-detector.bind-address";
- public static final String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS = "rhq.communications.multicast-detector.multicast-address";
- public static final String PROP_AGENT_MULTICAST_DETECTOR_PORT = "rhq.communications.multicast-detector.port";
-
- public static final String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL = "rhq.communications.connector.security.secure-socket-protocol";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_FILE = "rhq.communications.connector.security.keystore.file";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM = "rhq.communications.connector.security.keystore.algorithm";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_TYPE = "rhq.communications.connector.security.keystore.type";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD = "rhq.communications.connector.security.keystore.password";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD = "rhq.communications.connector.security.keystore.key-password";
- public static final String PROP_SECURITY_SERVER_KEYSTORE_ALIAS = "rhq.communications.connector.security.keystore.alias";
- public static final String PROP_SECURITY_SERVER_TRUSTSTORE_FILE = "rhq.communications.connector.security.truststore.file";
- public static final String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM = "rhq.communications.connector.security.truststore.algorithm";
- public static final String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE = "rhq.communications.connector.security.truststore.type";
- public static final String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD = "rhq.communications.connector.security.truststore.password";
- public static final String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE = "rhq.communications.connector.security.client-auth-mode";
-
- public static final String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL = "rhq.server.client.security.secure-socket-protocol";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_FILE = "rhq.server.client.security.keystore.file";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM = "rhq.server.client.security.keystore.algorithm";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_TYPE = "rhq.server.client.security.keystore.type";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD = "rhq.server.client.security.keystore.password";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD = "rhq.server.client.security.keystore.key-password";
- public static final String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS = "rhq.server.client.security.keystore.alias";
- public static final String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE = "rhq.server.client.security.truststore.file";
- public static final String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM = "rhq.server.client.security.truststore.algorithm";
- public static final String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE = "rhq.server.client.security.truststore.type";
- public static final String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD = "rhq.server.client.security.truststore.password";
- public static final String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED = "rhq.server.client.security.server-auth-mode-enabled";
-
- public static final String PREFIX_PROP_EMBEDDED_AGENT = "rhq.server.embedded-agent.";
- public static final String PROP_EMBEDDED_AGENT_ENABLED = PREFIX_PROP_EMBEDDED_AGENT + "enabled";
- public static final String PROP_EMBEDDED_AGENT_NAME = PREFIX_PROP_EMBEDDED_AGENT + "name";
- public static final String PROP_EMBEDDED_AGENT_DISABLE_NATIVE_SYSTEM = PREFIX_PROP_EMBEDDED_AGENT + "disable-native-system";
- public static final String PROP_EMBEDDED_AGENT_RESET_CONFIGURATION = PREFIX_PROP_EMBEDDED_AGENT + "reset-configuration";
-
- public static final String PROP_EMAIL_SMTP_HOST = "rhq.server.email.smtp-host";
- public static final String PROP_EMAIL_SMTP_PORT = "rhq.server.email.smtp-port";
- public static final String PROP_EMAIL_FROM_ADDRESS = "rhq.server.email.from-address";
-
- public static final String PROP_OPERATION_TIMEOUT = "rhq.server.operation-timeout";
-
- // TODO (jshaughn) Revisit the need for the cluster service when looking at cluster management. For now it's disabled.
- // public static final String PROP_CLUSTER_PARTITION_NAME = "jboss.partition.name";
- // public static final String PROP_CLUSTER_BIND_ADDRESS = "jgroups.bind_addr";
- // public static final String PROP_CLUSTER_UDP_GROUP = "jgroups.udp.mcast_addr";
- // public static final String PROP_CLUSTER_HAPARTITION_PORT = "jboss.hapartition.mcast_port";
- // public static final String PROP_CLUSTER_EJB3CACHE_PORT = "jboss.ejb3entitypartition.mcast_port";
- // public static final String PROP_CLUSTER_ALERTCACHE_PORT = "jboss.alertcachepartition.mcast_port";
- // public static final String PROP_CLUSTER_UDP_LOOPBACK = "rhq.server.startup.partition.udpLoopback";
- // public static final String PROP_CLUSTER_HAJNDI_PORT = "rhq.server.startup.hajndi.port";
- // public static final String PROP_CLUSTER_HAJNDI_RMIPORT = "rhq.server.startup.hajndi.rmiport";
- // public static final String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT = "rhq.server.startup.hajndi.autodiscoverygroupport";
- // public static final String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT = "rhq.server.startup.hajrmpinvoker.rmiport";
- // public static final String PROP_CLUSTER_HAPOOLEDINVOKER_PORT = "rhq.server.startup.hapooledinvoker.port";
- // public static final String PROP_CLUSTER_JGROUPS_UDP_IP_TTL = "jgroups.udp.ip_ttl";
-
- public static final String PROP_CONCURRENCY_LIMIT_WEBCONNS = "rhq.server.startup.web.max-connections";
- public static final String PROP_CONCURRENCY_LIMIT_GLOBAL = "rhq.communications.global-concurrency-limit";
- public static final String PROP_CONCURRENCY_LIMIT_INV_REPORT = "rhq.server.concurrency-limit.inventory-report";
- public static final String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT = "rhq.server.concurrency-limit.availability-report";
- public static final String PROP_CONCURRENCY_LIMIT_INV_SYNC = "rhq.server.concurrency-limit.inventory-sync";
- public static final String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT = "rhq.server.concurrency-limit.content-report";
- public static final String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD = "rhq.server.concurrency-limit.content-download";
- public static final String PROP_CONCURRENCY_LIMIT_MEAS_REPORT = "rhq.server.concurrency-limit.measurement-report";
- public static final String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ = "rhq.server.concurrency-limit.measurement-schedule-request";
-
- public static final String PROP_HIGH_AVAILABILITY_NAME = "rhq.server.high-availability.name";
- public static final String PROP_MM_AT_START = "rhq.server.maintenance-mode-at-startup";
-
- public static final String PREFIX_PROP_AUTOINSTALL = "rhq.autoinstall.";
- public static final String PROP_AUTOINSTALL_ENABLE = PREFIX_PROP_AUTOINSTALL + "enabled";
- public static final String PROP_AUTOINSTALL_DB = PREFIX_PROP_AUTOINSTALL + "database";
- public static final String PROP_AUTOINSTALL_PUBLIC_ENDPOINT = PREFIX_PROP_AUTOINSTALL + "public-endpoint-address";
-
- public static final List<SelectItem> DATABASE_TYPES;
- static {
- DATABASE_TYPES = new ArrayList<SelectItem>();
- DATABASE_TYPES.add(new SelectItem("PostgreSQL", "PostgreSQL"));
- DATABASE_TYPES.add(new SelectItem("Oracle", "Oracle"));
- DATABASE_TYPES.add(new SelectItem("sqlserver", "MS SQL Server"));
- DATABASE_TYPES.add(new SelectItem("H2", "H2 (embedded)"));
- //DATABASE_TYPES.add(new SelectItem("MySQL", "MySQL"));
- }
-
- public static final List<SelectItem> CLIENT_AUTH_MODES;
- static {
- CLIENT_AUTH_MODES = new ArrayList<SelectItem>();
- CLIENT_AUTH_MODES.add(new SelectItem("none"));
- CLIENT_AUTH_MODES.add(new SelectItem("want"));
- CLIENT_AUTH_MODES.add(new SelectItem("need"));
- }
-
- public static final List<SelectItem> TOMCAT_CLIENT_AUTH_MODES;
- static {
- TOMCAT_CLIENT_AUTH_MODES = new ArrayList<SelectItem>();
- TOMCAT_CLIENT_AUTH_MODES.add(new SelectItem("false"));
- TOMCAT_CLIENT_AUTH_MODES.add(new SelectItem("want"));
- TOMCAT_CLIENT_AUTH_MODES.add(new SelectItem("true"));
- }
-
- private PropertyItem[] allPropertyItems = {
- // the order of DB properties is very important here - start.jsp expects these to be in the configuration in this order
- new PropertyItem(PROP_DATABASE_TYPE, String.class, InstallerI18NResourceKeys.PROP_DATABASE_TYPE,
- InstallerI18NResourceKeys.PROP_DATABASE_TYPE_HELP, false, false, false, DATABASE_TYPES),
- new PropertyItem(PROP_DATABASE_CONNECTION_URL, String.class,
- InstallerI18NResourceKeys.PROP_DATABASE_CONNECTION_URL,
- InstallerI18NResourceKeys.PROP_DATABASE_CONNECTION_URL_HELP, false, false, false),
- new PropertyItem(PROP_DATABASE_DRIVER_CLASS, String.class,
- InstallerI18NResourceKeys.PROP_DATABASE_DRIVER_CLASS,
- InstallerI18NResourceKeys.PROP_DATABASE_DRIVER_CLASS_HELP, false, false, false),
- new PropertyItem(PROP_DATABASE_XA_DS_CLASS, String.class, InstallerI18NResourceKeys.PROP_DATABASE_XA_DS_CLASS,
- InstallerI18NResourceKeys.PROP_DATABASE_XA_DS_CLASS_HELP, false, false, false),
- new PropertyItem(PROP_DATABASE_USERNAME, String.class, InstallerI18NResourceKeys.PROP_DATABASE_USERNAME,
- InstallerI18NResourceKeys.PROP_DATABASE_USERNAME_HELP, false, false, false),
- new PropertyItem(PROP_DATABASE_PASSWORD, String.class, InstallerI18NResourceKeys.PROP_DATABASE_PASSWORD,
- InstallerI18NResourceKeys.PROP_DATABASE_PASSWORD_HELP, false, true, false),
- new PropertyItem(PROP_DATABASE_SERVER_NAME, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_DATABASE_PORT, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_DATABASE_DB_NAME, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_DATABASE_HIBERNATE_DIALECT, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_QUARTZ_DRIVER_DELEGATE_CLASS, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_QUARTZ_SELECT_WITH_LOCK_SQL, String.class, "", "", false, true, false, true),
- new PropertyItem(PROP_QUARTZ_LOCK_HANDLER_CLASS, String.class, "", "", false, true, false, true),
-
- new PropertyItem(PROP_SERVER_BIND_ADDRESS, String.class, InstallerI18NResourceKeys.PROP_SERVER_BIND_ADDRESS,
- InstallerI18NResourceKeys.PROP_SERVER_BIND_ADDRESS_HELP, true, false, false),
- new PropertyItem(PROP_HTTP_PORT, Integer.class, InstallerI18NResourceKeys.PROP_HTTP_PORT,
- InstallerI18NResourceKeys.PROP_HTTP_PORT_HELP, true, false, false, true),
- new PropertyItem(PROP_HTTPS_PORT, Integer.class, InstallerI18NResourceKeys.PROP_HTTPS_PORT,
- InstallerI18NResourceKeys.PROP_HTTPS_PORT_HELP, true, false, false, true),
- new PropertyItem(PROP_WEB_SERVICE_PORT, Integer.class, InstallerI18NResourceKeys.PROP_WEB_SERVICE_PORT,
- InstallerI18NResourceKeys.PROP_WEB_SERVICE_PORT_HELP, true, false, true),
- new PropertyItem(PROP_NAMING_SERVICE_PORT, Integer.class, InstallerI18NResourceKeys.PROP_NAMING_SERVICE_PORT,
- InstallerI18NResourceKeys.PROP_NAMING_SERVICE_PORT_HELP, true, false, true),
- new PropertyItem(PROP_NAMING_SERVICE_RMI_PORT, Integer.class,
- InstallerI18NResourceKeys.PROP_NAMING_SERVICE_RMI_PORT,
- InstallerI18NResourceKeys.PROP_NAMING_SERVICE_RMI_PORT_HELP, true, false, true),
- new PropertyItem(PROP_JRMP_INVOKER_RMI_PORT, Integer.class,
- InstallerI18NResourceKeys.PROP_JRMP_INVOKER_RMI_PORT,
- InstallerI18NResourceKeys.PROP_JRMP_INVOKER_RMI_PORT_HELP, true, false, true),
- new PropertyItem(PROP_POOLED_INVOKER_RMI_PORT, Integer.class,
- InstallerI18NResourceKeys.PROP_POOLED_INVOKER_RMI_PORT,
- InstallerI18NResourceKeys.PROP_POOLED_INVOKER_RMI_PORT_HELP, true, false, true),
- new PropertyItem(PROP_AJP_PORT, Integer.class, InstallerI18NResourceKeys.PROP_AJP_PORT,
- InstallerI18NResourceKeys.PROP_AJP_PORT_HELP, true, false, true),
- new PropertyItem(PROP_UNIFIED_INVOKER_PORT, Integer.class, InstallerI18NResourceKeys.PROP_UNIFIED_INVOKER_PORT,
- InstallerI18NResourceKeys.PROP_UNIFIED_INVOKER_PORT_HELP, true, false, true),
- new PropertyItem(PROP_ASPECT_DEPLOYER_PORT, Integer.class, InstallerI18NResourceKeys.PROP_ASPECT_DEPLOYER_PORT,
- InstallerI18NResourceKeys.PROP_ASPECT_DEPLOYER_PORT_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD_HELP, true, false, true,
- TOMCAT_CLIENT_AUTH_MODES),
- new PropertyItem(PROP_TOMCAT_SECURITY_SSL_PROTOCOL, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_SSL_PROTOCOL,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_SSL_PROTOCOL_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_ALGORITHM, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_ALGORITHM,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_ALGORITHM_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_KEYSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_TYPE_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE_HELP, true, false, true),
- new PropertyItem(PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD_HELP, true, false, true),
- new PropertyItem(PROP_CONNECTOR_TRANSPORT, String.class, InstallerI18NResourceKeys.PROP_CONNECTOR_TRANSPORT,
- InstallerI18NResourceKeys.PROP_CONNECTOR_TRANSPORT_HELP, false, false, true),
- new PropertyItem(PROP_CONNECTOR_BIND_ADDRESS, String.class,
- InstallerI18NResourceKeys.PROP_CONNECTOR_BIND_ADDRESS,
- InstallerI18NResourceKeys.PROP_CONNECTOR_BIND_ADDRESS_HELP, false, false, true, true),
- new PropertyItem(PROP_CONNECTOR_BIND_PORT, Integer.class, InstallerI18NResourceKeys.PROP_CONNECTOR_BIND_PORT,
- InstallerI18NResourceKeys.PROP_CONNECTOR_BIND_PORT_HELP, false, false, true, true),
- new PropertyItem(PROP_CONNECTOR_TRANSPORT_PARAMS, String.class,
- InstallerI18NResourceKeys.PROP_CONNECTOR_TRANSPORT_PARAMS,
- InstallerI18NResourceKeys.PROP_CONNECTOR_TRANSPORT_PARAMS_HELP, false, false, true),
- new PropertyItem(PROP_AGENT_MULTICAST_DETECTOR_ENABLED, Boolean.class,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_ENABLED,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_ENABLED_HELP, false, false, true),
- new PropertyItem(PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS, String.class,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS_HELP, false, false, true),
- new PropertyItem(PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS, String.class,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS_HELP, false, false, true),
- new PropertyItem(PROP_AGENT_MULTICAST_DETECTOR_PORT, Integer.class,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_PORT,
- InstallerI18NResourceKeys.PROP_AGENT_MULTICAST_DETECTOR_PORT_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_FILE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_FILE,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_FILE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_TYPE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_SERVER_KEYSTORE_ALIAS, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_ALIAS,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_KEYSTORE_ALIAS_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_TRUSTSTORE_FILE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_FILE,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_FILE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_TRUSTSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_TYPE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_SERVER_CLIENT_AUTH_MODE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_CLIENT_AUTH_MODE,
- InstallerI18NResourceKeys.PROP_SECURITY_SERVER_CLIENT_AUTH_MODE_HELP, false, false, true, CLIENT_AUTH_MODES),
- new PropertyItem(PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_FILE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_FILE,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_FILE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_TYPE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_CLIENT_KEYSTORE_ALIAS, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_ALIAS,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_KEYSTORE_ALIAS_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_TRUSTSTORE_FILE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_FILE,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_FILE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE_HELP, false, false, true),
- new PropertyItem(PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD, String.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD_HELP, false, true, true),
- new PropertyItem(PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED, Boolean.class,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED,
- InstallerI18NResourceKeys.PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED_HELP, false, false, true),
- new PropertyItem(PROP_EMBEDDED_AGENT_ENABLED, Boolean.class,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_ENABLED,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_ENABLED_HELP, false, false, false),
- new PropertyItem(PROP_EMBEDDED_AGENT_NAME, String.class,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_NAME,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_NAME_HELP, false, false, true),
- new PropertyItem(PROP_EMBEDDED_AGENT_DISABLE_NATIVE_SYSTEM, Boolean.class,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM_HELP, true, false, true),
- new PropertyItem(PROP_EMBEDDED_AGENT_RESET_CONFIGURATION, Boolean.class,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION,
- InstallerI18NResourceKeys.PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION_HELP, false, false, true),
- new PropertyItem(PROP_EMAIL_SMTP_HOST, String.class, InstallerI18NResourceKeys.PROP_EMAIL_SMTP_HOST,
- InstallerI18NResourceKeys.PROP_EMAIL_SMTP_HOST_HELP, false, false, false),
- new PropertyItem(PROP_EMAIL_SMTP_PORT, Integer.class, InstallerI18NResourceKeys.PROP_EMAIL_SMTP_PORT,
- InstallerI18NResourceKeys.PROP_EMAIL_SMTP_PORT_HELP, false, false, true),
- new PropertyItem(PROP_EMAIL_FROM_ADDRESS, String.class, InstallerI18NResourceKeys.PROP_EMAIL_FROM_ADDRESS,
- InstallerI18NResourceKeys.PROP_EMAIL_FROM_ADDRESS_HELP, false, false, false),
- new PropertyItem(PROP_OPERATION_TIMEOUT, Integer.class, InstallerI18NResourceKeys.PROP_OPERATION_TIMEOUT,
- InstallerI18NResourceKeys.PROP_OPERATION_TIMEOUT_HELP, false, false, true),
- // TODO (jshaughn) Revisit the need for the cluster service when looking at cluster management. For now it's disabled.
- // new PropertyItem(PROP_CLUSTER_PARTITION_NAME, String.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_PARTITION_NAME,
- // InstallerI18NResourceKeys.PROP_CLUSTER_PARTITION_NAME_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_BIND_ADDRESS, InetAddress.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_PARTITION_BIND_ADDRESS,
- // InstallerI18NResourceKeys.PROP_CLUSTER_PARTITION_BIND_ADDRESS_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_UDP_GROUP, String.class, InstallerI18NResourceKeys.PROP_CLUSTER_UDP_GROUP,
- // InstallerI18NResourceKeys.PROP_CLUSTER_UDP_GROUP_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAPARTITION_PORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAPARTITION_PORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAPARTITION_PORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_EJB3CACHE_PORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_EJB3CACHE_PORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_EJB3CACHE_PORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_ALERTCACHE_PORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_ALERTCACHE_PORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_ALERTCACHE_PORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_UDP_LOOPBACK, Boolean.class, InstallerI18NResourceKeys.PROP_CLUSTER_UDP_LOOPBACK,
- // InstallerI18NResourceKeys.PROP_CLUSTER_UDP_LOOPBACK_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAJNDI_PORT, Integer.class, InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_PORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_PORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAJNDI_RMIPORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_RMIPORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_RMIPORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAJRMPINVOKER_RMIPORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJRMPINVOKER_RMIPORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAJRMPINVOKER_RMIPORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_HAPOOLEDINVOKER_PORT, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAPOOLEDINVOKER_PORT,
- // InstallerI18NResourceKeys.PROP_CLUSTER_HAPOOLEDINVOKER_PORT_HELP, true, false, true),
- // new PropertyItem(PROP_CLUSTER_JGROUPS_UDP_IP_TTL, Integer.class,
- // InstallerI18NResourceKeys.PROP_CLUSTER_JGROUPS_UDP_IP_TTL,
- // InstallerI18NResourceKeys.PROP_CLUSTER_JGROUPS_UDP_IP_TTL_HELP, true, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_WEBCONNS, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_WEBCONNS,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_WEBCONNS_HELP, true, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_GLOBAL, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_GLOBAL,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_GLOBAL_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_INV_REPORT, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_INV_REPORT,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_INV_REPORT_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_AVAIL_REPORT, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_AVAIL_REPORT,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_AVAIL_REPORT_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_INV_SYNC, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_INV_SYNC,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_INV_SYNC_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_CONTENT_REPORT, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_CONTENT_REPORT,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_CONTENT_REPORT_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_MEAS_REPORT, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_MEAS_REPORT,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_MEAS_REPORT_HELP, false, false, true),
- new PropertyItem(PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ, Integer.class,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ,
- InstallerI18NResourceKeys.PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ_HELP, false, false, true),
- new PropertyItem(PROP_HIGH_AVAILABILITY_NAME, String.class,
- InstallerI18NResourceKeys.PROP_HIGH_AVAILABILITY_NAME,
- InstallerI18NResourceKeys.PROP_HIGH_AVAILABILITY_NAME_HELP, false, false, false, true),
- new PropertyItem(PROP_MM_AT_START, Boolean.class, InstallerI18NResourceKeys.PROP_MM_AT_START,
- InstallerI18NResourceKeys.PROP_MM_AT_START_HELP, false, false, true, false),
-
- new PropertyItem(PROP_AUTOINSTALL_ENABLE, Boolean.class, "", "", false, false, true, true),
- new PropertyItem(PROP_AUTOINSTALL_DB, String.class, "", "", false, false, true, true),
- new PropertyItem(PROP_AUTOINSTALL_PUBLIC_ENDPOINT, String.class, "", "", false, false, true, true) };
-
- /**
- * Returns the list of all known property items the server supports, in an order that is appropriate for display.
- *
- * @return ordered list of property item definitions
- */
- public List<PropertyItem> getPropertyItems() {
- return new ArrayList<PropertyItem>(Arrays.asList(allPropertyItems));
- }
-
- /**
- * Static convenience method that returns a valid server bind address as defined in the given properties. If not
- * found in the props or it is "0.0.0.0", then <code>InetAddress.getLocalHost().getHostAddress()</code> is used.
- * Therefore, keep in mind that this might return a value that is different than the value actually specified in the
- * given properties.
- *
- * @param props
- *
- * @return the server bind address string
- */
- public static String getValidServerBindAddress(Properties props) {
- String bindAddr;
-
- try {
- bindAddr = props.getProperty(ServerProperties.PROP_SERVER_BIND_ADDRESS, "0.0.0.0");
- if (bindAddr.trim().equals("0.0.0.0")) {
- bindAddr = InetAddress.getLocalHost().getHostAddress();
- }
- } catch (Exception e) {
- bindAddr = "127.0.0.1";
- }
-
- return bindAddr;
- }
-
- /**
- * Static convenience method that returns the HTTP port as defined in the given properties. If not found in the
- * props, it defaults to 7080. Therefore, keep in mind that this might return a value that is not actually specified
- * in the given properties.
- *
- * @param props
- *
- * @return the http port
- */
- public static String getHttpPort(Properties props) {
- return props.getProperty(ServerProperties.PROP_HTTP_PORT, "7080");
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/StartPageResults.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/StartPageResults.java
deleted file mode 100644
index 02aa712..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/StartPageResults.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer;
-
-public enum StartPageResults {
- SUCCESS, DBINVALID, ERROR, STAY, CREATEDB
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
deleted file mode 100644
index cd45495..0000000
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.installer.i18n;
-
-import mazz.i18n.Msg;
-import mazz.i18n.annotation.I18NMessage;
-import mazz.i18n.annotation.I18NMessages;
-import mazz.i18n.annotation.I18NResourceBundle;
-
-/**
- * NOTE THAT THIS FILE NEEDS TO BE ISO-8859-1 / ISO-8859-15 encoded !!!!!
- *
- * @author Mazz
- * @author Heiko W. Rupp
- * @author Victor.Montaner(a)zenika.com
- */
-@I18NResourceBundle(baseName = "InstallerMessages", defaultLocale = "en")
-public interface InstallerI18NResourceKeys {
- Msg.BundleBaseName BUNDLE_BASE_NAME = new Msg.BundleBaseName("InstallerMessages");
-
- @I18NMessage("${product.shortName}")
- String PRODUCT_SHORTNAME = "product.shortName";
- @I18NMessage("${product.name}")
- String PRODUCT_NAME = "product.name";
- @I18NMessage("${product.fullName}")
- String PRODUCT_FULLNAME = "product.fullName";
- @I18NMessage("${product.url}")
- String PRODUCT_URL = "product.url";
- @I18NMessage("${product.sales.email}")
- String PRODUCT_SALES_EMAIL = "product.sales.email";
- @I18NMessage("${product.support.email}")
- String PRODUCT_SUPPORT_EMAIL = "product.support.email";
-
- // as we translate our documentation - point to each language's root doc location
- @I18NMessages({ @I18NMessage(locale = "en", value = "${product.help.doc.root}") })
- String HELP_DOC_ROOT = "helpDocRoot";
-
- @I18NMessage(locale = "en", value = "Create Database/User")
- String CREATE_DATABASE_USER_TITLE = "createDatabaseUserTitle";
-
- @I18NMessage(locale = "en", value = "Enter your database administrator's information here and press the button to create a database and user.")
- String CREATE_DATABASE_USER_HELP = "createDatabaseUserHelp";
-
- @I18NMessage(locale = "en", value = "DB Connection URL")
- String ADMIN_CONNECTION_URL = "adminConnectionUrl";
-
- @I18NMessage(locale = "en", value = "DB Admin Username")
- String ADMIN_USERNAME = "adminUsername";
-
- @I18NMessage(locale = "en", value = "DB Admin Password")
- String ADMIN_PASSWORD = "adminPassword";
-
- @I18NMessage(locale = "en", value = "Usage of the selected database is for demo purposes only. It should not be used in production installations. No support is available for installations that use H2 or MS SQL Server for their database.")
- String EXPERIMENTAL_DB = "experimentalDb";
-
- @I18NMessage(locale = "en", value = "Create a database/user if needed")
- String CREATE_DATABASE_NOTE = "createDatabaseNote";
-
- @I18NMessage(locale = "en", value = "Create Database")
- String CREATE_DATABASE_BUTTON = "createDatabaseButton";
-
- @I18NMessage(locale = "en", value = "Confirm database settings")
- String TEST_DATABASE_NOTE = "testDatabaseNote";
-
- @I18NMessage(locale = "en", value = "Test Connection")
- String TEST_DATABASE_BUTTON = "testDatabaseButton";
-
- @I18NMessage(locale = "en", value = "A database schema already exists. What do you want to do?")
- String EXISTING_SCHEMA_QUESTION = "existingSchemaQuestion";
-
- @I18NMessage(locale = "en", value = "Overwrite (lose existing data)")
- String EXISTING_SCHEMA_OPTION_OVERWRITE = "existingSchemaAnswerOverwrite";
-
- @I18NMessage(locale = "en", value = "Keep (maintain existing data)")
- String EXISTING_SCHEMA_OPTION_KEEP = "existingSchemaAnswerUpgrade";
-
- @I18NMessage(locale = "en", value = "Skip (leave database as-is)")
- String EXISTING_SCHEMA_OPTION_SKIP = "existingSchemaAnswerSkip";
-
- @I18NMessage(locale = "en", value = "The {0} property value was an invalid number [{1}]")
- String INVALID_NUMBER = "invalidNumber";
-
- @I18NMessage(locale = "en", value = "The {0} boolean property value must be either 'true' or 'false' but was [{1}]")
- String INVALID_BOOLEAN = "invalidBoolean";
-
- @I18NMessage(locale = "en", value = "The {0} property value must be set.")
- String INVALID_STRING = "invalidString";
-
- @I18NMessage(locale = "en", value = "Failed to save properties and fully deploy - ${product.shortName} Server will not function properly\\n\\\nCause: {0}")
- String SAVE_FAILURE = "saveFailure";
-
- @I18NMessage(locale = "en", value = "Error")
- String ERROR_LABEL = "errorLabel";
-
- @I18NMessage(locale = "en", value = "Could not save the settings for some reason.")
- String SAVE_ERROR = "saveError";
-
- @I18NMessage(locale = "en", value = "Could not connect to the database with the given database settings. \\n\\\n"
- + "Please check the database settings and make sure your database is running.")
- String INVALID_DATABASE_SETTINGS = "invalidDatabaseSettings";
-
- @I18NMessage(locale = "en", value = "These are the configuration settings for this ${product.name} Server installation. \\n\\\n"
- + "You may customize some, all or none as required. Click on the setting name for setting-specific help. Changes to settings marked as \"Restart Required\" \\n\\\n"
- + "will not take effect until after restarting the server. In this case restart the server immediately after successful installation.")
- String SET_PROPERTIES_INSTRUCTIONS = "setPropertiesInstructions";
-
- @I18NMessage(locale = "en", value = "Click this checkbox to see both standard and advanced configuration settings.")
- String ADVANCED_SETTINGS_INSTRUCTIONS = "advancedSettingsInstructions";
-
- @I18NMessage(locale = "en", value = "Press the 'Production Installation' button for a normal installation.\\n\\\n"
- + "Press the 'Embedded Installation' button to quickly create a complete environment with the help of the embedded database and embedded agent. "
- + "The embedded installation is for demonstration and evaluation purposes ONLY!")
- String INSTALL_BUTTONS_TEXT = "installButtonsText";
-
- @I18NMessage(locale = "en", value = "-- or --")
- String OR_TEXT = "orText";
-
- @I18NMessage(locale = "en", value = "Embedded Installation")
- String SAVE_EMBEDDED_MODE = "saveEmbeddedMode";
-
- @I18NMessage(locale = "en", value = "Database Settings define the database configured for this installation. All are required. Use the \"Test Connection\" button to validate the settings.")
- String DATABASE_SETTINGS_INSTRUCTIONS = "databaseSettingsInstructions";
-
- @I18NMessage(locale = "en", value = "Installation Settings define the required server endpoint for this installation.")
- String INSTALL_SETTINGS_INSTRUCTIONS = "installSettingsInstructions";
-
- @I18NMessage(locale = "en", value = "If performing an upgrade or re-installation then select from the list of registered servers: ")
- String INSTALL_SETTINGS_NOTE_1 = "installSettingsNote1";
-
- @I18NMessage(locale = "en", value = "If installing a new server enter the server endpoint settings below:")
- String INSTALL_SETTINGS_NOTE_2 = "installSettingsNote2";
-
- @I18NMessage(locale = "en", value = "Server Settings configure the server for this installation. All server settings are required.")
- String SERVER_SETTINGS_INSTRUCTIONS = "serverSettingsInstructions";
-
- @I18NMessage(locale = "en", value = "Install Server!")
- String SAVE = "save";
-
- @I18NMessage(locale = "en", value = "Yes")
- String YES_STRING = "yesString";
-
- @I18NMessage(locale = "en", value = "No")
- String NO_STRING = "noString";
-
- @I18NMessage(locale = "en", value = "Property Name")
- String PROPERTY_NAME = "propertyName";
-
- @I18NMessage(locale = "en", value = "Value")
- String VALUE = "value";
-
- @I18NMessage(locale = "en", value = "Requires Restart?")
- String REQUIRES_RESTART = "requiresRestart";
-
- @I18NMessage(locale = "en", value = "Welcome to ${product.name}!")
- String WELCOME_TITLE = "welcomeTitle";
-
- @I18NMessage(locale = "en", value = "You have reached the ${product.name} Installer. Use this page \\n\\\n"
- + "to install and configure the ${product.name} Server. \\n\\\n"
- + "Once complete you will be able to log on and use ${product.name}.")
- String WELCOME_MESSAGE = "welcomeMessage";
-
- @I18NMessage(locale = "en", value = "Starting up, please wait... (this may take several minutes)")
- String STARTING = "starting";
-
- @I18NMessage(locale = "en", value = "${product.name} will be installed!")
- String ALREADY_INSTALLED = "alreadyInstalled";
-
- @I18NMessage(locale = "en", value = "Note: Remember to install the plugin packs for the ${product.name} server to begin properly monitoring you environment.")
- String ALREADY_INSTALLED_REMINDER = "alreadyInstalledReminder";
-
- @I18NMessage(locale = "en", value = "Done! Click here to get started!")
- String ALREADY_INSTALLED_STARTED_LINK = "alreadyInstalledStartedLink";
-
- @I18NMessage(locale = "en", value = "Click here to continue the installation")
- String START_INSTALLING_LINK = "startInstallingLink";
-
- @I18NMessage(locale = "en", value = "Back to configuration page")
- String BACK_TO_SETTINGS_LINK = "backToSettingsLink";
-
- @I18NMessage(locale = "en", value = "Show Advanced Settings")
- String SHOW_ADVANCED_SETTINGS = "showAdvancedSettings";
-
- // Below are the localized names of all the properties that can be configured
- // The _HELP I18NMessage strings refer to links under HELP_DOC_RHQ_SERVER_PROP_PARENT_PAGE
-
- @I18NMessage(locale = "en", value = "Database Type")
- String PROP_DATABASE_TYPE = "propertyDatabaseType";
- @I18NMessage(/* help url */"DatabaseType")
- String PROP_DATABASE_TYPE_HELP = "propertyDatabaseTypeHelp";
-
- @I18NMessage(locale = "en", value = "Database Connection URL")
- String PROP_DATABASE_CONNECTION_URL = "propertyDatabaseConnectionUrl";
- @I18NMessage(/* help url */"DatabaseConnectionURL")
- String PROP_DATABASE_CONNECTION_URL_HELP = "propertyDatabaseConnectionUrlHelp";
-
- @I18NMessage(locale = "en", value = "Database JDBC Driver Class")
- String PROP_DATABASE_DRIVER_CLASS = "propertyDatabaseDriverClass";
- @I18NMessage(/* help url */"DatabaseJDBCDriverClass")
- String PROP_DATABASE_DRIVER_CLASS_HELP = "propertyDatabaseDriverClassHelp";
-
- @I18NMessage(locale = "en", value = "Database XA DataSource Class")
- String PROP_DATABASE_XA_DS_CLASS = "propertyDatabaseXADataSourceClass";
- @I18NMessage(/* help url */"DatabaseXADataSourceClass")
- String PROP_DATABASE_XA_DS_CLASS_HELP = "propertyDatabaseXADataSourceClassHelp";
-
- @I18NMessage(locale = "en", value = "Database User Name")
- String PROP_DATABASE_USERNAME = "propertyDatabaseUserName";
- @I18NMessage(/* help url */"DatabaseUserName")
- String PROP_DATABASE_USERNAME_HELP = "propertyDatabaseUserNameHelp";
-
- @I18NMessage(locale = "en", value = "Database Password")
- String PROP_DATABASE_PASSWORD = "propertyDatabasePassword";
- @I18NMessage(/* help url */"DatabasePassword")
- String PROP_DATABASE_PASSWORD_HELP = "propertyDatabasePasswordHelp";
-
- @I18NMessage(locale = "en", value = "Server Bind Address")
- String PROP_SERVER_BIND_ADDRESS = "propertyBindAddress";
- @I18NMessage(/* help url */"ServerBindAddress")
- String PROP_SERVER_BIND_ADDRESS_HELP = "propertyBindAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "HTTP Port") })
- String PROP_HTTP_PORT = "propertyHttpPort";
- @I18NMessage(/* help url */"HTTPPort")
- String PROP_HTTP_PORT_HELP = "propertyHttpPortHelp";
-
- @I18NMessage(locale = "en", value = "Secure HTTPS Port")
- String PROP_HTTPS_PORT = "propertyHttpsPort";
- @I18NMessage(/* help url */"SecureHTTPSPort")
- String PROP_HTTPS_PORT_HELP = "propertyHttpsPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Web Service Port") })
- String PROP_WEB_SERVICE_PORT = "propertyWebServicePort";
- @I18NMessage(/* help url */"WebServicePort")
- String PROP_WEB_SERVICE_PORT_HELP = "propertyWebServicePortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service Port") })
- String PROP_NAMING_SERVICE_PORT = "propertyNamingServicePort";
- @I18NMessage(/* help url */"NamingServicePort")
- String PROP_NAMING_SERVICE_PORT_HELP = "propertyNamingServicePortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service RMI Port") })
- String PROP_NAMING_SERVICE_RMI_PORT = "propertyNamingServiceRmiPort";
- @I18NMessage(/* help url */"NamingServiceRMIPort")
- String PROP_NAMING_SERVICE_RMI_PORT_HELP = "propertyNamingServiceRmiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "JRMP Invoker RMI Port") })
- String PROP_JRMP_INVOKER_RMI_PORT = "propertyJrmpInvokerRmiPort";
- @I18NMessage(/* help url */"JRMPInvokerRMIPort")
- String PROP_JRMP_INVOKER_RMI_PORT_HELP = "propertyJrmpInvokerRmiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Pooled Invoker RMI Port") })
- String PROP_POOLED_INVOKER_RMI_PORT = "propertyPooledInvokerRmiPort";
- @I18NMessage(/* help url */"PooledInvokerRMIPort")
- String PROP_POOLED_INVOKER_RMI_PORT_HELP = "propertyPooledInvokerRmiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "AJP Port") })
- String PROP_AJP_PORT = "propertyAjpPort";
- @I18NMessage(/* help url */"AJPPort")
- String PROP_AJP_PORT_HELP = "propertyAjpPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Unified Invoker Port") })
- String PROP_UNIFIED_INVOKER_PORT = "propertyUnifiedInvokerPort";
- @I18NMessage(/* help url */"UnifiedInvokerPort")
- String PROP_UNIFIED_INVOKER_PORT_HELP = "propertyUnifiedInvokerPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Aspect Deployer Port") })
- String PROP_ASPECT_DEPLOYER_PORT = "propertyAspectDeployerPort";
- @I18NMessage(/* help url */"AspectDeployerPort")
- String PROP_ASPECT_DEPLOYER_PORT_HELP = "propertyAspectDeployerPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Client Auth Mode") })
- String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD = "propertyTomcatClientAuthMode";
- @I18NMessage(/* help url */"TomcatClientAuthMode")
- String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD_HELP = "propertyTomcatClientAuthModeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore/Truststore Algorithm") })
- String PROP_TOMCAT_SECURITY_ALGORITHM = "propertyTomcatAlgorithm";
- @I18NMessage(/* help url */"TomcatAlgorithm")
- String PROP_TOMCAT_SECURITY_ALGORITHM_HELP = "propertyTomcatAlgorithmHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore") })
- String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME = "propertyTomcatKeystoreFilename";
- @I18NMessage(/* help url */"TomcatKeystore")
- String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME_HELP = "propertyTomcatKeystoreFilenameHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Password") })
- String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD = "propertyTomcatKeystorePassword";
- @I18NMessage(/* help url */"TomcatKeystorePassword")
- String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD_HELP = "propertyTomcatKeystorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Type") })
- String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE = "propertyTomcatKeystoreType";
- @I18NMessage(/* help url */"TomcatKeystoreType")
- String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE_HELP = "propertyTomcatKeystoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Alias") })
- String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS = "propertyTomcatKeystoreAlias";
- @I18NMessage(/* help url */"TomcatKeystoreAlias")
- String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS_HELP = "propertyTomcatKeystoreAliasHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore") })
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME = "propertyTomcatTruststoreFilename";
- @I18NMessage(/* help url */"TomcatTruststore")
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME_HELP = "propertyTomcatTruststoreFilenameHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Password") })
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD = "propertyTomcatTruststorePassword";
- @I18NMessage(/* help url */"TomcatTruststorePassword")
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD_HELP = "propertyTomcatTruststorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Type") })
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE = "propertyTomcatTruststoreType";
- @I18NMessage(/* help url */"TomcatTruststoreType")
- String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE_HELP = "propertyTomcatTruststoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat SSL Protocol") })
- String PROP_TOMCAT_SECURITY_SSL_PROTOCOL = "propertyTomcatSslProtocol";
- @I18NMessage(/* help url */"TomcatSSLProtocol")
- String PROP_TOMCAT_SECURITY_SSL_PROTOCOL_HELP = "propertyTomcatSslProtocolHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport") })
- String PROP_CONNECTOR_TRANSPORT = "propertyConnectorTransport";
- @I18NMessage(/* help url */"IncomingAgentCommunicationsTransport")
- String PROP_CONNECTOR_TRANSPORT_HELP = "propertyConnectorTransportHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Bind Address") })
- String PROP_CONNECTOR_BIND_ADDRESS = "propertyConnectorBindAddress";
- @I18NMessage(/* help url */"IncomingAgentCommunicationsBindAddress")
- String PROP_CONNECTOR_BIND_ADDRESS_HELP = "propertyConnectorBindAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Port") })
- String PROP_CONNECTOR_BIND_PORT = "propertyConnectorBindPort";
- @I18NMessage(/* help url */"IncomingAgentCommunicationsPort")
- String PROP_CONNECTOR_BIND_PORT_HELP = "propertyConnectorBindPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport Parameters") })
- String PROP_CONNECTOR_TRANSPORT_PARAMS = "propertyConnectorTransportParams";
- @I18NMessage(/* help url */"IncomingAgentCommunicationsTransportParameters")
- String PROP_CONNECTOR_TRANSPORT_PARAMS_HELP = "propertyConnectorTransportParamsHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Enabled") })
- String PROP_AGENT_MULTICAST_DETECTOR_ENABLED = "propertyAgentMulticastDetectorEnabled";
- @I18NMessage(/* help url */"AgentMulticastDetectorEnabled")
- String PROP_AGENT_MULTICAST_DETECTOR_ENABLED_HELP = "propertyAgentMulticastDetectorEnabledHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Bind Address") })
- String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS = "propertyAgentMulticastDetectorBindAddress";
- @I18NMessage(/* help url */"AgentMulticastDetectorBindAddress")
- String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS_HELP = "propertyAgentMulticastDetectorBindAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Multicast Address") })
- String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS = "propertyAgentMulticastDetectorMulticastAddress";
- @I18NMessage(/* help url */"AgentMulticastDetectorMulticastAddress")
- String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS_HELP = "propertyAgentMulticastDetectorMulticastAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Port") })
- String PROP_AGENT_MULTICAST_DETECTOR_PORT = "propertyAgentMulticastDetectorPort";
- @I18NMessage(/* help url */"AgentMulticastDetectorPort")
- String PROP_AGENT_MULTICAST_DETECTOR_PORT_HELP = "propertyAgentMulticastDetectorPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Secure Socket Protocol") })
- String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL = "propertySecurityServerSecureSocketProtocol";
- @I18NMessage(/* help url */"IncomingSecureSocketProtocol")
- String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityServerSecureSocketProtocolHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore File") })
- String PROP_SECURITY_SERVER_KEYSTORE_FILE = "propertySecurityServerKeystoreFile";
- @I18NMessage(/* help url */"IncomingKeystoreFile")
- String PROP_SECURITY_SERVER_KEYSTORE_FILE_HELP = "propertySecurityServerKeystoreFileHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Algorithm") })
- String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM = "propertySecurityServerKeystoreAlgorithm";
- @I18NMessage(/* help url */"IncomingKeystoreAlgorithm")
- String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM_HELP = "propertySecurityServerKeystoreAlgorithmHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Type") })
- String PROP_SECURITY_SERVER_KEYSTORE_TYPE = "propertySecurityServerKeystoreType";
- @I18NMessage(/* help url */"IncomingKeystoreType")
- String PROP_SECURITY_SERVER_KEYSTORE_TYPE_HELP = "propertySecurityServerKeystoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Password") })
- String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD = "propertySecurityServerKeystorePassword";
- @I18NMessage(/* help url */"IncomingKeystorePassword")
- String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD_HELP = "propertySecurityServerKeystorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Key Password") })
- String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD = "propertySecurityServerKeystoreKeyPassword";
- @I18NMessage(/* help url */"IncomingKeystoreKeyPassword")
- String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityServerKeystoreKeyPasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Alias") })
- String PROP_SECURITY_SERVER_KEYSTORE_ALIAS = "propertySecurityServerKeystoreAlias";
- @I18NMessage(/* help url */"IncomingKeystoreAlias")
- String PROP_SECURITY_SERVER_KEYSTORE_ALIAS_HELP = "propertySecurityServerKeystoreAliasHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore File") })
- String PROP_SECURITY_SERVER_TRUSTSTORE_FILE = "propertySecurityServerTruststoreFile";
- @I18NMessage(/* help url */"IncomingTruststoreFile")
- String PROP_SECURITY_SERVER_TRUSTSTORE_FILE_HELP = "propertySecurityServerTruststoreFileHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Algorithm") })
- String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM = "propertySecurityServerTruststoreAlgorithm";
- @I18NMessage(/* help url */"IncomingTruststoreAlgorithm")
- String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityServerTruststoreAlgorithmHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Type") })
- String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE = "propertySecurityServerTruststoreType";
- @I18NMessage(/* help url */"IncomingTruststoreType")
- String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE_HELP = "propertySecurityServerTruststoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Password") })
- String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD = "propertySecurityServerTruststorePassword";
- @I18NMessage(/* help url */"IncomingTruststorePassword")
- String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD_HELP = "propertySecurityServerTruststorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Client Authentication Mode") })
- String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE = "propertySecurityServerClientAuthMode";
- @I18NMessage(/* help url */"IncomingClientAuthenticationMode")
- String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE_HELP = "propertySecurityServerClientAuthModeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Secure Socket Protocol") })
- String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL = "propertySecurityClientSecureSocketProtocol";
- @I18NMessage(/* help url */"OutgoingSecureSocketProtocol")
- String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityClientSecureSocketProtocolHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore File") })
- String PROP_SECURITY_CLIENT_KEYSTORE_FILE = "propertySecurityClientKeystoreFile";
- @I18NMessage(/* help url */"OutgoingKeystoreFile")
- String PROP_SECURITY_CLIENT_KEYSTORE_FILE_HELP = "propertySecurityClientKeystoreFileHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Algorithm") })
- String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM = "propertySecurityClientKeystoreAlgorithm";
- @I18NMessage(/* help url */"OutgoingKeystoreAlgorithm")
- String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM_HELP = "propertySecurityClientKeystoreAlgorithmHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Type") })
- String PROP_SECURITY_CLIENT_KEYSTORE_TYPE = "propertySecurityClientKeystoreType";
- @I18NMessage(/* help url */"OutgoingKeystoreType")
- String PROP_SECURITY_CLIENT_KEYSTORE_TYPE_HELP = "propertySecurityClientKeystoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Password") })
- String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD = "propertySecurityClientKeystorePassword";
- @I18NMessage(/* help url */"OutgoingKeystorePassword")
- String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD_HELP = "propertySecurityClientKeystorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Key Password") })
- String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD = "propertySecurityClientKeystoreKeyPassword";
- @I18NMessage(/* help url */"OutgoingKeystoreKeyPassword")
- String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityClientKeystoreKeyPasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Alias") })
- String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS = "propertySecurityClientKeystoreAlias";
- @I18NMessage(/* help url */"OutgoingKeystoreAlias")
- String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS_HELP = "propertySecurityClientKeystoreAliasHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore File") })
- String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE = "propertySecurityClientTruststoreFile";
- @I18NMessage(/* help url */"OutgoingTruststoreFile")
- String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE_HELP = "propertySecurityClientTruststoreFileHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Algorithm") })
- String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM = "propertySecurityClientTruststoreAlgorithm";
- @I18NMessage(/* help url */"OutgoingTruststoreAlgorithm")
- String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityClientTruststoreAlgorithmHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Type") })
- String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE = "propertySecurityClientTruststoreType";
- @I18NMessage(/* help url */"OutgoingTruststoreType")
- String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE_HELP = "propertySecurityClientTruststoreTypeHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Password") })
- String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD = "propertySecurityClientTruststorePassword";
- @I18NMessage(/* help url */"OutgoingTruststorePassword")
- String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD_HELP = "propertySecurityClientTruststorePasswordHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Server Authentication Mode Enabled") })
- String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED = "propertySecurityClientServerAuthModeEnabled";
- @I18NMessage(/* help url */"OutgoingServerAuthenticationModeEnabled")
- String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED_HELP = "propertySecurityClientServerAuthModeEnabledHelp";
-
- @I18NMessage(locale = "en", value = "Embedded Agent Enabled")
- String PROP_EMBEDDED_RHQ_AGENT_ENABLED = "propertyEmbeddedRHQAgentEnabled";
- @I18NMessage(/* help url */"EmbeddedRHQAgentEnabled")
- String PROP_EMBEDDED_RHQ_AGENT_ENABLED_HELP = "propertyEmbeddedRHQAgentEnabledHelp";
-
- @I18NMessage(locale = "en", value = "Embedded Agent Name")
- String PROP_EMBEDDED_RHQ_AGENT_NAME = "propertyEmbeddedRHQAgentName";
- @I18NMessage(/* help url */"EmbeddedRHQAgentName")
- String PROP_EMBEDDED_RHQ_AGENT_NAME_HELP = "propertyEmbeddedRHQAgentNameHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Disable Native System") })
- String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM = "propertyEmbeddedRHQAgentDisableNativeSystem";
- @I18NMessage(/* help url */"EmbeddedRHQAgentDisableNativeSystem")
- String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM_HELP = "propertyEmbeddedRHQAgentDisableNativeSystemHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Reset Configuration") })
- String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION = "propertyEmbeddedRHQAgentResetConfiguration";
- @I18NMessage(/* help url */"EmbeddedRHQAgentResetConfiguration")
- String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION_HELP = "propertyEmbeddedRHQAgentResetConfigurationHelp";
-
- @I18NMessage(locale = "en", value = "Email SMTP Hostname")
- String PROP_EMAIL_SMTP_HOST = "propertyEmailSmtpHost";
- @I18NMessage(/* help url */"EmailSMTPHostname")
- String PROP_EMAIL_SMTP_HOST_HELP = "propertyEmailSmtpHostHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Email SMTP Port") })
- String PROP_EMAIL_SMTP_PORT = "propertyEmailSmtpPort";
- @I18NMessage(/* help url */"EmailSMTPPort")
- String PROP_EMAIL_SMTP_PORT_HELP = "propertyEmailSmtpPortHelp";
-
- @I18NMessage(locale = "en", value = "Email From Address")
- String PROP_EMAIL_FROM_ADDRESS = "propertyEmailFromAddress";
- @I18NMessage(/* help url */"EmailFromAddress")
- String PROP_EMAIL_FROM_ADDRESS_HELP = "propertyEmailFromAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Operation Invocation Default Timeout") })
- String PROP_OPERATION_TIMEOUT = "propertyOperationTimeout";
- @I18NMessage(/* help url */"OperationInvocationDefaultTimeout")
- String PROP_OPERATION_TIMEOUT_HELP = "propertyOperationTimeoutHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Name") })
- String PROP_CLUSTER_PARTITION_NAME = "propertyClusterPartitionName";
- @I18NMessage(/* help url */"PartitionName")
- String PROP_CLUSTER_PARTITION_NAME_HELP = "propertyClusterPartitionNameHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Bind Address") })
- String PROP_CLUSTER_PARTITION_BIND_ADDRESS = "propertyClusterPartitionBindAddress";
- @I18NMessage(/* help url */"PartitionBindAddress")
- String PROP_CLUSTER_PARTITION_BIND_ADDRESS_HELP = "propertyClusterPartitionBindAddressHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Group IP Address") })
- String PROP_CLUSTER_UDP_GROUP = "propertyClusterUdpGroup";
- @I18NMessage(/* help url */"PartitionUDPMulticastGroupIPAddress")
- String PROP_CLUSTER_UDP_GROUP_HELP = "propertyClusterUdpGroupHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Port") })
- String PROP_CLUSTER_HAPARTITION_PORT = "propertyClusterHaPartitionPort";
- @I18NMessage(/* help url */"PartitionUDPMulticastPort")
- String PROP_CLUSTER_HAPARTITION_PORT_HELP = "propertyClusterHaPartitionPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP EJB3 Entity Cache Multicast Port") })
- String PROP_CLUSTER_EJB3CACHE_PORT = "propertyClusterEjb3CachePort";
- @I18NMessage(/* help url */"PartitionUDPEJB3EntityCacheMulticastPort")
- String PROP_CLUSTER_EJB3CACHE_PORT_HELP = "propertyClusterEjb3CachePortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Alert Cache Multicast Port") })
- String PROP_CLUSTER_ALERTCACHE_PORT = "propertyClusterAlertCachePort";
- @I18NMessage(/* help url */"PartitionUDPAlertCacheMulticastPort")
- String PROP_CLUSTER_ALERTCACHE_PORT_HELP = "propertyClusterAlertCachePortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Loopback") })
- String PROP_CLUSTER_UDP_LOOPBACK = "propertyClusterUdpLoopback";
- @I18NMessage(/* help url */"PartitionUDPLoopback")
- String PROP_CLUSTER_UDP_LOOPBACK_HELP = "propertyClusterUdpLoopbackHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Port") })
- String PROP_CLUSTER_HAJNDI_PORT = "propertyClusterHaJndiPort";
- @I18NMessage(/* help url */"HAJNDIPort")
- String PROP_CLUSTER_HAJNDI_PORT_HELP = "propertyClusterHaJndiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI RMI Port") })
- String PROP_CLUSTER_HAJNDI_RMIPORT = "propertyClusterHaJndiRmiPort";
- @I18NMessage(/* help url */"HAJNDIRMIPort")
- String PROP_CLUSTER_HAJNDI_RMIPORT_HELP = "propertyClusterHaJndiRmiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Auto Discovery Group Port") })
- String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT = "propertyClusterHaJndiAutoDiscoveryPort";
- @I18NMessage(/* help url */"HAJNDIAutoDiscoveryGroupPort")
- String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT_HELP = "propertyClusterHaJndiAutoDiscoveryPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JRMP Invoker RMI Port") })
- String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT = "propertyClusterHaJrmpInvokerRmiPort";
- @I18NMessage(/* help url */"HAJRMPInvokerRMIPort")
- String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT_HELP = "propertyClusterHaJrmpInvokerRmiPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA Pooled Invoker Port") })
- String PROP_CLUSTER_HAPOOLEDINVOKER_PORT = "propertyClusterHaPooledInvokerPort";
- @I18NMessage(/* help url */"HAPooledInvokerPort")
- String PROP_CLUSTER_HAPOOLEDINVOKER_PORT_HELP = "propertyClusterHaPooledInvokerPortHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - JGroups UDP IP Time To Live") })
- String PROP_CLUSTER_JGROUPS_UDP_IP_TTL = "propertyClusterJGroupsUdpIpTtl";
- @I18NMessage(/* help url */"JGroupsUDPIPTimeToLive")
- String PROP_CLUSTER_JGROUPS_UDP_IP_TTL_HELP = "propertyClusterJGroupsUdpIpTtlHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Maximum Web Connections") })
- String PROP_CONCURRENCY_LIMIT_WEBCONNS = "propertyConcurrencyLimitWebConns";
- @I18NMessage(/* help url */"WebConnections")
- String PROP_CONCURRENCY_LIMIT_WEBCONNS_HELP = "propertyConcurrencyLimitWebConnsHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Global") })
- String PROP_CONCURRENCY_LIMIT_GLOBAL = "propertyConcurrencyLimitGlobal";
- @I18NMessage(/* help url */"GlobalConcurrencyLimit")
- String PROP_CONCURRENCY_LIMIT_GLOBAL_HELP = "propertyConcurrencyLimitGlobalHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Reports") })
- String PROP_CONCURRENCY_LIMIT_INV_REPORT = "propertyConcurrencyLimitInventoryReport";
- @I18NMessage(/* help url */"InventoryReport")
- String PROP_CONCURRENCY_LIMIT_INV_REPORT_HELP = "propertyConcurrencyLimitInventoryReportHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Availability Reports") })
- String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT = "propertyConcurrencyLimitAvailabilityReport";
- @I18NMessage(/* help url */"AvailabilityReport")
- String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT_HELP = "propertyConcurrencyLimitAvailabilityReportHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Synchronizations") })
- String PROP_CONCURRENCY_LIMIT_INV_SYNC = "propertyConcurrencyLimitInventorySync";
- @I18NMessage(/* help url */"InventorySynchronization")
- String PROP_CONCURRENCY_LIMIT_INV_SYNC_HELP = "propertyConcurrencyLimitInventorySyncHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Reports") })
- String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT = "propertyConcurrencyLimitContentReport";
- @I18NMessage(/* help url */"ContentReport")
- String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT_HELP = "propertyConcurrencyLimitContentReportHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Downloads") })
- String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD = "propertyConcurrencyLimitContentDownload";
- @I18NMessage(/* help url */"ContentDownload")
- String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD_HELP = "propertyConcurrencyLimitContentDownloadHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Reports") })
- String PROP_CONCURRENCY_LIMIT_MEAS_REPORT = "propertyConcurrencyLimitMeasurementReport";
- @I18NMessage(/* help url */"MeasurementReport")
- String PROP_CONCURRENCY_LIMIT_MEAS_REPORT_HELP = "propertyConcurrencyLimitMeasurementReportHelp";
-
- @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Schedule Requests") })
- String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ = "propertyConcurrencyLimitMeasurementScheduleRequest";
- @I18NMessage(/* help url */"MeasurementScheduleRequest")
- String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ_HELP = "propertyConcurrencyLimitMeasurementScheduleRequestHelp";
-
- // Help Documentation - links to the wiki
-
- @I18NMessage(locale = "en", value = "Please review the documentation linked below to learn more about ${product.name}:")
- String INTRODUCE_HELP_DOCS = "introduceHelpDocs";
-
- @I18NMessage("${product.help.installation}")
- String HELP_DOC_RHQ_SERVER_INSTALL_GUIDE = "helpDocRHQServerInstallGuide";
- @I18NMessage(locale = "en", value = "${product.name} Server Installation Guide")
- String HELP_DOC_RHQ_SERVER_INSTALL_GUIDE_LABEL = "helpDocRHQServerInstallGuideLabel";
-
- @I18NMessage("GUI+Console+Users+Guide")
- String HELP_DOC_RHQ_GUI_CONSOLE_USERS_GUIDE = "helpDocRHQGuiConsoleUsersGuide";
- @I18NMessage(locale = "en", value = "${product.name} GUI Console Users Guide")
- String HELP_DOC_RHQ_GUI_CONSOLE_USERS_GUIDE_LABEL = "helpDocRHQGuiConsoleUsersGuideLabel";
-
- @I18NMessage("${product.help.guide.server}")
- String HELP_DOC_RHQ_SERVER_USERS_GUIDE = "helpDocRHQServerUsersGuide";
- @I18NMessage(locale = "en", value = "${product.name} Server Users Guide")
- String HELP_DOC_RHQ_SERVER_USERS_GUIDE_LABEL = "helpDocRHQServerUsersGuideLabel";
-
- @I18NMessage("${product.help.guide.agent}")
- String HELP_DOC_RHQ_AGENT_USERS_GUIDE = "helpDocRHQAgentUsersGuide";
- @I18NMessage(locale = "en", value = "${product.name} Agent Users Guide")
- String HELP_DOC_RHQ_AGENT_USERS_GUIDE_LABEL = "helpDocRHQAgentUsersGuideLabel";
-
- @I18NMessage("${product.help.FAQ}")
- String HELP_DOC_FAQ = "helpDocFaq";
- @I18NMessage(locale = "en", value = "Frequently Asked Questions")
- String HELP_DOC_FAQ_LABEL = "helpDocFaqLabel";
-
- // the page that contains all the config props help text
- // this is NOT under the help doc root - it should be a doc root too
- @I18NMessage("${product.help.config.props}")
- String HELP_DOC_RHQ_SERVER_PROP_PARENT_PAGE = "helpDocRHQServerPropParentPage";
-
- @I18NMessage(locale = "en", value = "New Server")
- String NEW_SERVER_SELECT_ITEM = "newServerSelectItem";
-
- @I18NMessage(locale = "en", value = "Registered Servers:")
- String REGISTERED_SERVERS_LABEL = "registeredServersLabel";
-
- @I18NMessage(locale = "en", value = "Server Name")
- String PROP_HIGH_AVAILABILITY_NAME = "propertyHighAvailabilityName";
- @I18NMessage(/* help url */"ServerName")
- String PROP_HIGH_AVAILABILITY_NAME_HELP = "propertyHighAvailabilityNameHelp";
-
- @I18NMessage(locale = "en", value = "Maintenance Mode At Start")
- String PROP_MM_AT_START = "propertyMaintenanceModeAtStart";
- @I18NMessage(/* help url */"MaintenanceModeAtStart")
- String PROP_MM_AT_START_HELP = "propertyMaintenanceModeAtStartHelp";
-
- @I18NMessage(locale = "en", value = "Server Public Address")
- String PROP_HIGH_AVAILABILITY_ENDPOINT_ADDRESS = "propertyHighAvailabilityEndpointAddress";
-
- @I18NMessage(locale = "en", value = "Server Affinity Group Name")
- String PROP_HIGH_AVAILABILITY_AFFINITY_GROUP = "propertyHighAvailabilityAffinityGroup";
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_de.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_de.properties
deleted file mode 100644
index 5fdf56c..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_de.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-createDatabaseUserTitle=Datenbank mit -benutzer anlegen
-createDatabaseUserHelp=Geben Sie die Administratoreninformation hier ein, und clicken Sie den Button, um eine Datenbank mit Benutzer anzulegen.
-adminConnectionUrl=URL der Datenbankverbindung
-adminUsername=Benutzername des Datenbankadministrators
-adminPassword=Passwort des Datenbankadministrators
-experimentalDb=Unterstützung für diese Datenbank ist experimentell und ist nur für Demo-und Testzwecke geeignet.
-createDatabaseNote=DB mit -benutzer anlegen, falls nötig
-createDatabaseButton=Datenbank anlegen
-testDatabaseNote=Überprüfen Sie, dass die Einstellungen für die Datenbank gültig sind
-testDatabaseButton=Verbindung testen
-existingSchemaQuestion=Das gewünschte Datenbankschema existiert schon. Was wollen Sie machen?
-existingSchemaAnswerOverwrite=Überschreiben (vorhandene Daten gehen verloren)
-existingSchemaAnswerUpgrade=Behalten (existierende Daten werden aktualisiert)
-existingSchemaAnswerSkip=Umgehen (Datenbank bleibt wie sie ist)
-invalidNumber=[{1}] ist ein ungültiger Zahlenwert für die Eigenschaft {0}
-invalidBoolean=Die boolesche Eigenschaft {0} muss entweder 'true' oder 'false' sein, war aber [{1}]
-invalidString=Die Eigenschaft {0} muss gesetzt werden.
-saveFailure=Konnte die Einstellungen nicht speichern und den Server vollständig starten.\n\
-Der ${product.shortName} Server wird nicht korrekt funktionieren.\n\
-Grund: {0}
-errorLabel=Fehler
-saveError=Kann die Einstellungen nicht sichern
-invalidDatabaseSettings=Eine Verbindung zur Datenbank ist mit den gebenen Einstellungen für die Datenbank nicht möglich. \n\
-Bitte überprüfen Sie die Einstellungen und stellen Sie sicher, dass die Datenbak aktiv ist
-setPropertiesInstructions=Diese Seite zeigt Ihnen die Konfigurationseinstellungen \n\
-für die Installation des ${product.shortName} Servers. Sie können keinen, einige oder alle\n\
-dieser Werte nach Ihren Anforderungen ändern. Sie können auf den Namen einer Einstellung klicken, um direkt weitere Informationen zu erhalten.\n\
-Bitte beachten sie, dass \n\
-einige dieser Änderungen erst nach einem Neustart des Servers aktiv werden. \n\
-Wenn Sie diese Einstellungen ändern, müssen Sie den Server sofort neu starten, damit \n\
-sie aufgegriffen werden.
-advancedSettingsInstructions=Markieren Sie diese Checkbox, um die standardmäßigen und weiterführende Einstellungen anzuzeigen.
-installButtonsText=Drücken Sie die 'Produktion Installation'-Taste für eine normale Installation durchzuführen.\n\
-Drücken Sie die 'Embedded Installation'-Taste, um schnell eine vollständige Umgebung mit Hilfe der eingebetteten Datenbank und Embedded Agenten zu erstellen. Die Embedded-Installation ist nur für Demonstrations- und Evaluierungszwecke geeignet!
-orText=-- oder --
-saveEmbeddedMode=Embedded Installation
-databaseSettingsInstructions=Die Datenbankeinstellungen definieren die Datenbank für diese Installation. Alle Einstellungen werden benötigt.\n\
-Klicken Sie auf den "Verbindung testen" Button, um die Einstellungen zu validieren.
-installSettingsInstructions=Diese Einstellungen definieren den notwendigen Server-Endpunkt für diese Installation.
-installSettingsNote1=Wählen Sie aus der Liste der registrierten Server, wenn Sie ein Upgrade oder eine Neuinstallation durchführen.
-installSettingsNote2=Geben Sie den Serverendpunkt unten ein, wenn Sie eine Neuinstallation durchführen:
-serverSettingsInstructions=Diese Servereinstellungen konfigurieren den Server für diese Installation. Alle Einstellungen werden benötigt.
-save=Server installieren!
-yesString=Ja
-noString=Nein
-propertyName=Eigenschaft
-value=Wert
-requiresRestart=Neustart erforderlich?
-welcomeTitle=Willkommen bei ${product.shortName}!
-welcomeMessage=Willkommen beim Installationsprogramm von ${product.shortName}. Mit diesem können Sie \n\
-${product.shortName} installieren und konfigurieren. \n\
-Nachdem dies geschehen ist, können Sie sich einloggen und mit ${product.shortName} arbeiten
-starting=Bitte warten Sie bis der Server gestartet ist
-alreadyInstalled=${product.shortName} wird installiert
-alreadyInstalledStartedLink=Fertig! Klicken Sie hier, um fortzufahren!
-startInstallingLink=Klicken Sie hier, um mit der Installation fortzufahren
-backToSettingsLink=Zurück zur Seite mit den Einstellungen
-showAdvancedSettings=Erweiterte Einstellungen anzeigen
-propertyDatabaseType=Datenbanktyp
-propertyDatabaseConnectionUrl=URL der Datenbankverbindung
-propertyDatabaseDriverClass=Klassnname des JDBC-Datenbanktreibers
-propertyDatabaseXADataSourceClass=Klassnname des XA-Datenbanktreibers
-propertyDatabaseUserName=Name des Datenbankbenutzers
-propertyDatabasePassword=Password des Datenbankbenutzers
-propertyBindAddress=IP-Adresse an die der Sever sich binden soll
-propertyHttpsPort=HTTPS Port
-propertyEmbeddedRHQAgentEnabled=Eingebetteten Agent verwenden
-propertyEmbeddedRHQAgentName=Name des eingebetteten Agent
-propertyEmailSmtpHost=Hostname des SMTP Servers
-propertyEmailFromAddress=E-Mail Absenderadresse
-introduceHelpDocs=Die unten aufgeführten Links enthalten weitere Informationen zu ${product.shortName}:
-helpDocRHQServerInstallGuideLabel=${product.shortName} Server Installationsanleitung
-helpDocRHQGuiConsoleUsersGuideLabel=Benutzerhandbuch ${product.shortName} GUI
-helpDocRHQServerUsersGuideLabel=Benutzerhandbuch ${product.shortName} Server
-helpDocRHQAgentUsersGuideLabel=Benutzerhandbuch ${product.shortName} Agent
-helpDocFaqLabel=Häufig gestellte Fragen
-newServerSelectItem=Neuer Server
-registeredServersLabel=Registrierte Server:
-propertyHighAvailabilityName=Servername
-propertyMaintenanceModeAtStart=Maintenance Mode At Start
-propertyHighAvailabilityEndpointAddress=HA-Endpunkt-Adresse des Servers
-propertyHighAvailabilityAffinityGroup=Name der zugehörigen Servergruppe
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_fr.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_fr.properties
deleted file mode 100644
index d2a51b4..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_fr.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-invalidNumber=La valeur du paramètre {0} n'est pas un nombre valide [{1}]
-invalidBoolean=La valeur booléenne du paramètre {0} devait être 'true' ou 'false', mais était [{1}]
-saveFailure=Impossible de sauvegarder les paramètres et de déployer entièrement - RHQ Server ne fonctionnera pas correctement\n\
-Cause: {0}
-errorLabel=Erreur
-saveError=Impossible de sauvegarder les paramètres pour une raison inconnue
-invalidDatabaseSettings=Impossible de se connecter à la base de données avec les paramètres donnés. \n\
-Veuillez vérifier les paramètres et que la base de données est opérationnelle.
-setPropertiesInstructions=Cette page vous montre les valeurs actuelles de la configuration \n\
-pour cette installation de RHQ Server. Vous pouvez en changez certains, tous, ou aucun \n\
-d'entre elles pour vos besoin personnels. Veuillez noter que certains de \n\
-ces changements ne prendront place qu'après un redémarrage du \n\
-serveur. Si vous changez l'une de ces valeurs, vous devrez \n\
-immediatement arrêter et redémarrer le serveur pour appliquer les changements.
-save=Installez ${product.shortName} Server!
-yesString=Oui
-noString=Non
-propertyName=Propriété
-value=Valeur
-requiresRestart=Redémarrage nécessaire?
-welcomeTitle=Bienvenue sur ${product.shortName}!
-welcomeMessage=Voici le programme d'installation de ${product.shortName}. Vous allez utiliser cette page \n\
-pour compléter l'installation et configurer ${product.shortName} Server. \n\
-Une fois complétée, vous pourrez vous identifier et commencer à utiliser ${product.shortName}
-starting=Démarrage, veuillez patienter...
-alreadyInstalled=${product.shortName} sera installé
-alreadyInstalledStartedLink=Terminé! Cliquez ici pour commencer!
-startInstallingLink=Cliquez ici pour continuer l'installation
-backToSettingsLink=Retour à la page de configuration
-showAdvancedSettings=Montrer les options avancées
-propertyDatabaseType=Type de Base de Données
-propertyDatabaseConnectionUrl=URL de connexion à la base de données
-propertyDatabaseDriverClass=Classe du driver JDBC de la base de données
-propertyDatabaseUserName=Nom d'utilisateur de la base de données
-propertyDatabasePassword=Mot de passe de la base de données
-propertyBindAddress=Adresse IP à laquelle le serveur doit se lier
-propertyHttpsPort=Port HTTPS Sécurisé
-propertyEmbeddedRHQAgentEnabled=Activer l'Agent embarqué
-propertyEmbeddedRHQAgentName=Nom du Agent embarqué
-propertyEmailFromAddress=E-Mail de l'expéditeur
-introduceHelpDocs=Veuillez consulter la documentation ci-dessous pour en apprendre plus sur ${product.shortName}:
-helpDocRHQServerInstallGuideLabel=Guide d'installation de ${product.shortName} Server
-helpDocRHQGuiConsoleUsersGuideLabel=Guide d'utilisation de la ${product.shortName} GUI Console
-helpDocRHQServerUsersGuideLabel=Guide d'utilisation de ${product.shortName} Server
-helpDocRHQAgentUsersGuideLabel=Guide d'utilisation de ${product.shortName} Agent
-helpDocFaqLabel=Foire Aux Questions
-orText=-- ou --
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties
deleted file mode 100644
index 719a354..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties
+++ /dev/null
@@ -1,157 +0,0 @@
-createDatabaseUserTitle=\uc0dd\uc131 \ub370\uc774\ud130\ubca0\uc774\uc2a4/\uc0ac\uc6a9\uc790
-createDatabaseUserHelp=\uc5ec\uae30\uc5d0 \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uad00\ub9ac\uc790 \uc815\ubcf4\ub97c \uc785\ub825\ud558\uace0 \ub370\uc774\ud130\ubca0\uc774\uc2a4\uc640 \uc0ac\uc6a9\uc790\ub97c \ub9cc\ub4e4 \uc218 \uc788\ub294 \ubc84\ud2bc\uc744 \ub204\ub974\uc2ed\uc2dc\uc624.
-adminConnectionUrl=DB \uc5f0\uacb0 URL
-adminUsername=DB \uad00\ub9ac\uc790 \uc0ac\uc6a9\uc790\uba85
-adminPassword=DB \uad00\ub9ac\uc790 \ube44\ubc00\ubc88\ud638
-experimentalDb=\uc120\ud0dd\ud55c \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub294 \ub370\ubaa8 \uc6a9\ub3c4\ub85c\ub9cc \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uc6b4\uc601 \ud658\uacbd \uc124\uce58\uc5d0 \uc0ac\uc6a9\ub418\uc5b4\uc11c\ub294 \uc548\ub429\ub2c8\ub2e4. H2 \ub610\ub294 MS SQL Server \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud55c \uc124\uce58\uc5d0 \ub300\ud574\uc11c\ub294 \uae30\uc220 \uc9c0\uc6d0\uc744 \uc81c\uacf5\ud558\uc9c0\uc54a\uc2b5\ub2c8\ub2e4.
-createDatabaseNote=\ud544\uc694\ud55c \uacbd\uc6b0 \ub370\uc774\ud130\ubca0\uc774\uc2a4/\uc0ac\uc6a9\uc790 \uc0dd\uc131
-createDatabaseButton=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc0dd\uc131\ud558\uae30
-testDatabaseNote=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc124\uc815 \ud655\uc778
-testDatabaseButton=\uc5f0\uacb0 \ud14c\uc2a4\ud2b8
-existingSchemaQuestion=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc2a4\ud0a4\ub9c8\uac00 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4. \uc5b4\ub5bb\uac8c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
-existingSchemaAnswerOverwrite=\ub36e\uc5b4\uc4f0\uae30 (\uae30\uc874 \ub370\uc774\ud130\ub97c \uc783\uac8c\ub429\ub2c8\ub2e4)
-existingSchemaAnswerUpgrade=\uc720\uc9c0 (\uae30\uc874 \ub370\uc774\ud130\ub97c \uc218\uc815\ud569\ub2c8\ub2e4)
-existingSchemaAnswerSkip=\uac74\ub108\ub6f0\uae30 (\uae30\uc874 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4)
-invalidNumber={0} \uc18d\uc131 \uac12\uc740 \uc798\ubabb\ub41c \uc22b\uc790 [{1}] \uc785\ub2c8\ub2e4.
-invalidBoolean={0} boolean \uc18d\uc131 \uac12\uc740 \u2018true' \ub610\ub294 \u2018false'\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. \uadf8\ub7ec\ub098 [{1}] \uac12\uc785\ub2c8\ub2e4.
-invalidString={0} \uc18d\uc131 \uac12\uc744 \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4.
-saveFailure=\uc18d\uc131\uc744 \uc800\uc7a5\ud558\uace0 \ubc30\ud3ec\ud558\ub294\ub370 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4. - RHQ \uc11c\ubc84\uac00 \uc815\uc0c1\uc801\uc73c\ub85c \ub3d9\uc791\ud558\uc9c0 \uc54a\uc744 \uac83\uc785\ub2c8\ub2e4.\n\
-\uc6d0\uc778: {0}
-errorLabel=\uc5d0\ub7ec
-saveError=\ubb38\uc81c\uac00 \ubc1c\uc0dd\ud558\uc5ec \uc124\uc815\uc744 \uc800\uc7a5 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-invalidDatabaseSettings=\uc785\ub825\ub41c \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc124\uc815\uc73c\ub85c \ub370\uc774\ud130\ubca0\uc774\uc2a4\uc5d0 \uc5f0\uacb0 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \n\
-\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc124\uc815\uc744 \ud655\uc778\ud558\uace0 \ub370\uc774\ud130\ubca0\uc774\uc2a4\uac00 \uc2e4\ud589 \uc911\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-setPropertiesInstructions=RHQ \uc11c\ubc84 \uc124\uce58\ub97c \uc704\ud55c \uad6c\uc131 \uc124\uc815\uc774 \ud544\uc694\ud569\ub2c8\ub2e4. \n\
-\ud544\uc694\uc5d0 \ub530\ub77c \uc77c\ubd80 \ub610\ub294 \uc804\uccb4 \uc124\uc815\uc744 \uc0ac\uc6a9\uc790 \uc815\uc758 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ud639\uc740 \ubcc0\uacbd\uc5c6\uc774 \uae30\ubcf8 \uc124\uc815\uc73c\ub85c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uc124\uc815 \uad00\ub828 \ub3c4\uc6c0\ub9d0\uc740 \uc124\uc815 \uc774\ub984\uc744 \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624. \u201c\uc7ac\uc2dc\uc791 \ud544\uc694"\ub85c \ud45c\uc2dc\ub41c \uc124\uc815 \ubcc0\uacbd\uc740 \uc11c\ubc84 \uc7ac\uc2dc\uc791 \ud6c4 \uc801\uc6a9 \uac00\ub2a5\ud569\ub2c8\ub2e4. \n\
-\uc774\ub7ec\ud55c \uacbd\uc6b0\ub294 \uc124\uce58\ub97c \uc131\uacf5\uc801\uc73c\ub85c \ub9c8\uce5c \ud6c4 \uc989\uc2dc \uc11c\ubc84\ub97c \uc7ac\uc2dc\uc791\ud558\uc2ed\uc2dc\uc624.
-advancedSettingsInstructions=\uae30\ubcf8\uacfc \uace0\uae09 \uad6c\uc131 \uc124\uc815\ub97c \ubaa8\ub450 \ud655\uc778\ud558\uae30 \uc704\ud574\uc11c \uccb4\ud06c\ubc15\uc2a4\ub97c \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624.
-installButtonsText=\uc77c\ubc18\uc801\uc778 \uc124\uce58\ub97c \uc704\ud574\uc11c \u2019\uc6b4\uc601 \uc124\uce58\u2019 \ubc84\ud2bc\uc744 \ub204\ub974\uc2ed\uc2dc\uc624.\n\
-\uc784\ubca0\ub514\ub4dc \ub370\uc774\ud130\ubca0\uc774\uc2a4\uc640 \uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8\uc758 \ub3c4\uc6c0\uc73c\ub85c \ud658\uacbd \uc124\uc815\uc744 \uc2e0\uc18d\ud558\uac8c \ub9cc\ub4e4\uae30\uc704\ud574\uc11c \u2018\uc784\ubca0\ub514\ub4dc \uc124\uce58' \ubc84\ud2bc\uc744 \ub204\ub974\uc2ed\uc2dc\uc624. \uc784\ubca0\ub514\ub4dc \uc124\uce58\ub294 \uc624\uc9c1 \uc2dc\uc5f0\uc774\ub098 \ub610\ub294 \ud3c9\uac00 \ubaa9\uc801\uc785\ub2c8\ub2e4. orText=-- \ub610\ub294 --
-saveEmbeddedMode=\uc784\ubca0\ub514\ub4dc \uc124\uce58
-databaseSettingsInstructions=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc124\uc815\uc740 \ubcf8 \uc124\uce58\ub97c \uc704\ud55c \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uad6c\uc131\uc744 \uc815\uc758\ud569\ub2c8\ub2e4. \ubaa8\ub4e0 \uc124\uc815\uc774 \ud544\uc218\uc785\ub2c8\ub2e4. \uc124\uc815\uc744 \ud655\uc778\ud558\uae30\uc704\ud574\uc11c\ub294 \u2018\uc5f0\uacb0 \ud14c\uc2a4\ud2b8' \ubc84\ud2bc\uc744 \uc0ac\uc6a9\ud558\uc2ed\uc2dc\uc624.
-installSettingsInstructions=\uc124\uce58 \uc124\uc815\uc740 \ubcf8 \uc124\uce58\ub97c \uc704\ud55c \ud544\uc218 \uc11c\ubc84 \ub05d\uc810\uc744 \uc815\uc758\ud569\ub2c8\ub2e4.
-installSettingsNote1=\uc5c5\uadf8\ub808\uc774\ub4dc \ub610\ub294 \uc7ac\uc124\uce58\ub97c \uc218\ud589\ud558\ub294 \uacbd\uc6b0, \ub2e4\uc74c\uc758 \ub4f1\ub85d\ub41c \uc11c\ubc84\uc5d0\uc11c \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624:
-installSettingsNote2=\uc0c8\ub85c\uc6b4 \uc11c\ubc84\ub97c \uc124\uce58\ud558\ub294 \uacbd\uc6b0, \uc544\ub798\uc5d0 \uc11c\ubc84 endpoint \uc124\uc815\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624:
-serverSettingsInstructions=\uc11c\ubc84 \uc124\uc815\uc740 \ubcf8 \uc124\uce58\ub97c \uc704\ud574 \uc11c\ubc84\ub97c \uad6c\uc131\ud569\ub2c8\ub2e4. \ubaa8\ub4e0 \uc11c\ubc84 \uc124\uc815\uc774 \ud544\uc218\uc785\ub2c8\ub2e4.
-save=\uc11c\ubc84 \uc124\uce58!
-yesString=\uc608
-noString=\uc544\ub2c8\uc694
-propertyName= \uc18d\uc131 \uc774\ub984
-value=\uac12
-requiresRestart=\uc7ac\uc2dc\uc791 \ud544\uc694?
-welcomeTitle=RHQ\uc5d0 \uc624\uc2e0\uac83\uc744 \ud658\uc601\ud569\ub2c8\ub2e4!
-welcomeMessage=RHQ \uc124\uce58 \uad00\ub9ac\uc790\uc5d0 \uc624\uc168\uc2b5\ub2c8\ub2e4. RHQ \uc11c\ubc84\ub97c \uad6c\uc131\ud558\uace0 \uc124\uce58\ud558\uae30 \uc704\ud574\uc11c \n\
-\uc774 \ud398\uc774\uc9c0\ub97c \uc0ac\uc6a9\ud558\uc2ed\uc2dc\uc624. \n\
-\uc644\ub8cc \ud6c4 RHQ\uc5d0 \ub85c\uadf8\uc628\ud558\uace0 \uc0ac\uc6a9 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-starting=\uad6c\ub3d9 \uc911\uc785\ub2c8\ub2e4. \uc7a0\uc2dc\ub9cc \uae30\ub2e4\ub824 \uc8fc\uc2ed\uc2dc\uc624...
-alreadyInstalled=RHQ\uac00 \uc124\uce58\ub429\ub2c8\ub2e4!
-alreadyInstalledStartedLink=\uc644\ub8cc! \uc2dc\uc791\ud558\ub824\uba74 \uc5ec\uae30\ub97c \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624!
-startInstallingLink=\uc124\uce58\ub97c \uacc4\uc18d\ud558\ub824\uba74 \uc5ec\uae30\ub97c \ud074\ub9ad\ud558\uc2ed\uc2dc\uc624
-backToSettingsLink=\uad6c\uc131 \ud398\uc774\uc9c0\ub85c \ub3cc\uc544\uac00\uae30
-showAdvancedSettings=\uace0\uae09 \uc124\uc815 \ubcf4\uae30
-propertyDatabaseType=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ud0c0\uc785
-propertyDatabaseConnectionUrl=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc5f0\uacb0 URL
-propertyDatabaseDriverClass=\ub370\uc774\ud130\ubca0\uc774\uc2a4 JDBC \ub4dc\ub77c\uc774\ubc84 \ud074\ub798\uc2a4
-propertyDatabaseXADataSourceClass=\ub370\uc774\ud130\ubca0\uc774\uc2a4 XA \ub370\uc774\ud130\uc18c\uc2a4 \ud074\ub798\uc2a4
-propertyDatabaseUserName=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc0ac\uc6a9\uc790 \uc774\ub984
-propertyDatabasePassword=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ube44\ubc00\ubc88\ud638
-propertyBindAddress=\uc11c\ubc84 \ubc14\uc778\ub4dc \uc8fc\uc18c
-propertyHttpPort=HTTP \ud3ec\ud2b8
-propertyHttpsPort=\ubcf4\uc548 HTTPS \ud3ec\ud2b8
-propertyWebServicePort=\uc6f9 \uc11c\ube44\uc2a4 \ud3ec\ud2b8
-propertyNamingServicePort=\ub124\uc774\ubc0d \uc11c\ube44\uc2a4 \ud3ec\ud2b8
-propertyNamingServiceRmiPort=\ub124\uc774\ubc0d \uc11c\ube44\uc2a4 RMI \ud3ec\ud2b8
-propertyJrmpInvokerRmiPort=JRMP \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8
-propertyPooledInvokerRmiPort=\ud480\ub9c1 \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8
-propertyAjpPort=AJP \ud3ec\ud2b8
-propertyUnifiedInvokerPort=\ud1b5\ud569 \ud638\ucd9c\uc790 \ud3ec\ud2b8
-propertyAspectDeployerPort=Aspect \ubc30\ud3ec\uc790 \ud3ec\ud2b8
-propertyTomcatClientAuthMode=\ud1b0\ucf13 \ud074\ub77c\uc774\uc5b8\ud2b8 \uc778\uc99d \ubaa8\ub4dc
-propertyTomcatAlgorithm=\ud1b0\ucf13 Keystore/Truststore \uc54c\uace0\ub9ac\uc998
-propertyTomcatKeystoreFilename=\ud1b0\ucf13 Keystore
-propertyTomcatKeystorePassword=\ud1b0\ucf13 Keystore \ube44\ubc00\ubc88\ud638
-propertyTomcatKeystoreType=\ud1b0\ucf13 Keystore \ud0c0\uc785
-propertyTomcatKeystoreAlias=\ud1b0\ucf13 Keystore \ubcc4\uce6d
-propertyTomcatTruststoreFilename=\ud1b0\ucf13 Truststore
-propertyTomcatTruststorePassword=\ud1b0\ucf13 Truststore \ube44\ubc00\ubc88\ud638
-propertyTomcatTruststoreType=\ud1b0\ucf13 Truststore \ud0c0\uc785
-propertyTomcatSslProtocol=\ud1b0\ucf13 SSL \ud504\ub85c\ud1a0\ucf5c
-propertyConnectorTransport=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \uc804\uc1a1
-propertyConnectorBindAddress=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \ubc14\uc778\ub4dc \uc8fc\uc18c
-propertyConnectorBindPort=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \ud3ec\ud2b8
-propertyConnectorTransportParams=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \uc804\uc1a1 \ud30c\ub77c\ubbf8\ud130
-propertyAgentMulticastDetectorEnabled=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ud65c\uc131\ud654
-propertyAgentMulticastDetectorBindAddress=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ubc14\uc778\ub4dc \uc8fc\uc18c
-propertyAgentMulticastDetectorMulticastAddress=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \uba40\ud2f0\uce90\uc2a4\ud2b8 \uc8fc\uc18c
-propertyAgentMulticastDetectorPort=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ud3ec\ud2b8
-propertySecurityServerSecureSocketProtocol=\uc218\uc2e0 \ubcf4\uc548 - \ubcf4\uc548 \uc18c\ucf13 \ud504\ub85c\ud1a0\ucf5c
-propertySecurityServerKeystoreFile=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud30c\uc77c
-propertySecurityServerKeystoreAlgorithm=\uc218\uc2e0 \ubcf4\uc548 - Keystore \uc54c\uace0\ub9ac\uc998
-propertySecurityServerKeystoreType=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud0c0\uc785
-propertySecurityServerKeystorePassword=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ube44\ubc00\ubc88\ud638
-propertySecurityServerKeystoreKeyPassword=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud0a4 \ud328\uc2a4\uc6cc\ub4dc
-propertySecurityServerKeystoreAlias=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ubcc4\uce6d
-propertySecurityServerTruststoreFile=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud30c\uc77c
-propertySecurityServerTruststoreAlgorithm=\uc218\uc2e0 \ubcf4\uc548 - Truststore \uc54c\uace0\ub9ac\uc998
-propertySecurityServerTruststoreType=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud0c0\uc785
-propertySecurityServerTruststorePassword=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud328\uc2a4\uc6cc\ub4dc
-propertySecurityServerClientAuthMode=\uc218\uc2e0 \ubcf4\uc548 - \ud074\ub77c\uc774\uc5b8\ud2b8 \uc778\uc99d \ubaa8\ub4dc
-propertySecurityClientSecureSocketProtocol=\ubc1c\uc2e0 \ubcf4\uc548 - \ubcf4\uc548 \uc18c\ucf13 \ud504\ub85c\ud1a0\ucf5c
-propertySecurityClientKeystoreFile=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud30c\uc77c
-propertySecurityClientKeystoreAlgorithm=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \uc54c\uace0\ub9ac\uc998
-propertySecurityClientKeystoreType=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud0c0\uc785
-propertySecurityClientKeystorePassword=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ube44\ubc00\ubc88\ud638
-propertySecurityClientKeystoreKeyPassword=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud0a4 \ube44\ubc00\ubc88\ud638
-propertySecurityClientKeystoreAlias=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ubcc4\uce6d
-propertySecurityClientTruststoreFile=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ud30c\uc77c
-propertySecurityClientTruststoreAlgorithm=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \uc54c\uace0\ub9ac\uc998
-propertySecurityClientTruststoreType=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ud0c0\uc785
-propertySecurityClientTruststorePassword=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ube44\ubc00\ubc88\ud638
-propertySecurityClientServerAuthModeEnabled=\ubc1c\uc2e0 \ubcf4\uc548 - \uc11c\ubc84 \uc778\uc99d \ubaa8\ub4dc \ud65c\uc131\ud654
-propertyEmbeddedRHQAgentEnabled=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ud65c\uc131\ud654
-propertyEmbeddedRHQAgentName=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \uc774\ub984
-propertyEmbeddedRHQAgentDisableNativeSystem=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ubd88\uac00 \ub124\uc774\ud2f0\ube0c \uc2dc\uc2a4\ud15c
-propertyEmbeddedRHQAgentResetConfiguration=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ucd08\uae30\ud654 \uad6c\uc131
-propertyEmailSmtpHost=\uc774\uba54\uc77c SMTP \ud638\uc2a4\ud2b8\uba85
-propertyEmailSmtpPort=\uc774\uba54\uc77c SMTP \ud3ec\ud2b8
-propertyEmailFromAddress=\uc774\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c
-propertyOperationTimeout=\uc791\uc5c5\uc218\ud589 \ud638\ucd9c \uae30\ubcf8 \ud0c0\uc784\uc544\uc6c3
-propertyClusterPartitionName=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 \uc774\ub984
-propertyClusterPartitionBindAddress=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 \ubc14\uc778\ub4dc \uc8fc\uc18c
-propertyClusterUdpGroup=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 UDP \uba40\ud2f0\uce90\uc2a4\ud2b8 \uadf8\ub8f9 \uc544\uc774\ud53c \uc8fc\uc18c
-propertyClusterHaPartitionPort=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 UDP \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8
-propertyClusterEjb3CachePort=Cluster - \ud30c\ud2f0\uc158 UDP EJB3 \uc5d4\ud2f0\ud2f0 \uce90\uc2dc \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8
-propertyClusterAlertCachePort=Cluster - \ud30c\ud2f0\uc158 UDP \uc54c\ub9bc \uce90\uc2dc \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8
-propertyClusterUdpLoopback=Cluster - \ud30c\ud2f0\uc158 UDP \ub8e8\ud504\ubc31
-propertyClusterHaJndiPort=Cluster - HA JNDI \ud3ec\ud2b8
-propertyClusterHaJndiRmiPort=Cluster - HA JNDI RMI \ud3ec\ud2b8
-propertyClusterHaJndiAutoDiscoveryPort=Cluster - HA JNDI \uc790\ub3d9 \ud0d0\uc0c9 \uadf8\ub8f9 \ud3ec\ud2b8
-propertyClusterHaJrmpInvokerRmiPort=Cluster - HA JRMP \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8
-propertyClusterHaPooledInvokerPort=Cluster - HA \ud480\ub9c1 \ud638\ucd9c\uc790 \ud3ec\ud2b8
-propertyClusterJGroupsUdpIpTtl=Cluster - JGroups UDP \uc544\uc774\ud53c Time To Live
-propertyConcurrencyLimitWebConns=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucd5c\ub300 \uc6f9 \uc5f0\uacb0
-propertyConcurrencyLimitGlobal=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uae00\ub85c\ubc8c
-propertyConcurrencyLimitInventoryReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ubaa9\ub85d \ubcf4\uace0\uc11c
-propertyConcurrencyLimitAvailabilityReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uac00\uc6a9\uc131 \ubcf4\uace0\uc11c
-propertyConcurrencyLimitInventorySync=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ubaa9\ub85d \ub3d9\uae30\ud654
-propertyConcurrencyLimitContentReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucf58\ud150\uce20 \ubcf4\uace0\uc11c
-propertyConcurrencyLimitContentDownload=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucf58\ud150\uce20 \ub2e4\uc6b4\ub85c\ub4dc
-propertyConcurrencyLimitMeasurementReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uce21\uc815 \ubcf4\uace0\uc11c
-propertyConcurrencyLimitMeasurementScheduleRequest=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uce21\uc815 \uc2a4\ucf00\uc974 \uc694\uccad
-introduceHelpDocs=RHQ\uc5d0 \ub300\ud55c \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 \uc544\ub798 \ub9c1\ud06c\ub41c \ubb38\uc11c\ub97c \ucc38\uace0\ud558\uc2ed\uc2dc\uc624:
-helpDocRHQServerInstallGuide=\uc124\uce58
-helpDocRHQServerInstallGuideLabel=RHQ \uc11c\ubc84 \uc124\uce58 \uac00\uc774\ub4dc
-helpDocRHQGuiConsoleUsersGuide=GUI+Console+Users+Guide
-helpDocRHQGuiConsoleUsersGuideLabel=RHQ GUI \ucf58\uc194 \uc0ac\uc6a9\uc790 \uac00\uc774\ub4dc
-helpDocRHQServerUsersGuide=Running+the+RHQ+Server
-helpDocRHQServerUsersGuideLabel=RHQ \uc11c\ubc84 \uc0ac\uc6a9\uc790 \uac00\uc774\ub4dc
-helpDocRHQAgentUsersGuide=Running+the+RHQ+Agent
-helpDocRHQAgentUsersGuideLabel=RHQ \uc5d0\uc774\uc804\ud2b8 \uc0ac\uc6a9\uc790 \uac00\uc774\ub4dc
-helpDocFaq=FAQ
-helpDocFaqLabel=\uc790\uc8fc \ubb3b\ub294 \uc9c8\ubb38
-newServerSelectItem=\uc2e0\uaddc \uc11c\ubc84
-registeredServersLabel=\ub4f1\ub85d\ub41c \uc11c\ubc84:
-propertyHighAvailabilityName=\uc11c\ubc84 \uc774\ub984
-propertyMaintenanceModeAtStart=\uad6c\ub3d9\uc2dc \uc720\uc9c0 \uad00\ub9ac \ubaa8\ub4dc
-propertyHighAvailabilityEndpointAddress=\uc11c\ubc84 \uacf5\uac1c \uc8fc\uc18c
-propertyHighAvailabilityAffinityGroup=\uc11c\ubc84 \ub3d9\uc9c8 \uadf8\ub8f9 \uc774\ub984
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties
deleted file mode 100644
index d5845f4..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-createDatabaseUserTitle=Criar Base de Dados/Usu\u00E1rio
-createDatabaseUserHelp=Entre com as informa\u00E7\u00F5es do administrador do banco de dados e clique no bot\u00E3o para criar o baco de dados e o usu\u00E1rio.
-adminConnectionUrl=URL de conex\u00E3o com BD
-adminUsername=Usu\u00E1rio administrador do BD
-adminPassword=Senha de administrador do BD
-experimentalDb=O banco de dados selecionado \u00E9 utilizado apenas para demonstra\u00E7\u00E3o. Ele n\u00E3o deve ser utilizado em ambiente de produ\u00E7\u00E3o. N\u00E3o h\u00E1 suporte dispon\u00EDvel para insta\u00E7\u00E3oes que utilizam H2 ou MS SQL Server como banco de dados.
-createDatabaseNote=Cria um banco de dados e usu\u00E1rio se necess\u00E1rio
-createDatabaseButton=Criar Banco de Dados
-testDatabaseNote=Confirmar configura\u00E7\u00F5es do banco de dados
-testDatabaseButton=Testar Conex\u00E3o
-existingSchemaQuestion=O esquema do banco de dados j\u00E1 existe. O que deseja fazer?
-existingSchemaAnswerOverwrite=Substituir (os dados existentes ser\u00E3o perdidos)
-existingSchemaAnswerUpgrade=Manter (os dados existentes ser\u00E3o mantidos)
-existingSchemaAnswerSkip=Prosseguir (deixar o banco de dados como est\u00E1)
-invalidNumber=O valor da propriedade {0} \u00E9 um n\u00FAmero inv\u00E1lido\: [{1}]
-invalidBoolean=O valor da propriedade booleana {0} deve ser 'true' ou 'false' mas foi atribu\u00EDdo como [{1}]
-invalidString=O valor da propriedade {0} deve ser informado.
-saveFailure=Falha ao gravar as propriedades e implantar - O Servidor RHQ n\u00E3o funcionar\u00E1 apropriadamente\nCausa\: {0}
-errorLabel=Erro
-saveError=Por algum motivo n\u00E3o foi poss\u00EDvel gravar as configura\u00E7\u00F5es.
-invalidDatabaseSettings=N\u00E3o foi poss\u00EDvel conectar ao banco banco de dados com as propriedades informadas. \nFavor verificar as configura\u00E7\u00F5es do banco de dados e certifircar-se de que est\u00E1 em execu\u00E7\u00E3o.
-setPropertiesInstructions=Estas s\u00E3o as configura\u00E7\u00F5es para a instala\u00E7\u00E3o do Servidor RHQ. \nVoc\u00EA pode customizar alguma, todas ou nenhuma conforme necess\u00E1rio. Clique no nome da propriedade para visualizar a ajuda espec\u00EDfica. Altera\u00E7\u00F5es nas configura\u00E7\u00F5es marcadas como "Restart Necess\u00E1rio" \nn\u00E3o ter\u00E3o efeito at\u00E9 que o servidor seja reiniciado. Nesse caso reinicie o servidor imediatamente ap\u00F3s a instala\u00E7\u00E3o ter sido conclu\u00EDda com sucesso.
-advancedSettingsInstructions=Marque esta caixa de sele\u00E7\u00E3o para visualizar as configura\u00E7\u00F5es avan\u00E7adas.
-installButtonsText=Pressione o bot\u00E3o 'Instala\u00E7\u00E3o de Produ\u00E7\u00E3o' para uma instala\u00E7\u00E3o normal.\nPressione o bot\u00E3o 'Instala\u00E7ao Embutida' para criar rapidamente um ambiente completo com a ajuda do banco de dados e do agente embutidos. A instala\u00E7\u00E3o embutida possui apenas o prop\u00F3sito de demonstra\u00E7\u00E3o e avalia\u00E7\u00E3o\!
-orText=-- ou --
-saveEmbeddedMode=Instala\u00E7\u00E3o habilitada
-databaseSettingsInstructions=As propriedades do banco de dados definem o banco de dados configurado para esta instala\u00E7\u00E3o. Todos os campos s\u00E3o necess\u00E1rios. Use o bot\u00E3o "Testar Conex\u00E3o" para validar as propriedades.
-installSettingsInstructions=As propriedades de acesso definem localiza\u00E7\u00E3o (endpoint) do servidor.
-installSettingsNote1=No caso de uma atualiza\u00E7\u00E3o ou reinstala\u00E7\u00E3o selecione a partir da lista de servidores registrados\:
-installSettingsNote2=No caso de uma nova instala\u00E7\u00E3o informe as propriedades abaixo\:
-serverSettingsInstructions=Todos os campos abaixo s\u00E3o necess\u00E1rios.
-save=Instalar Servidor\!
-yesString=Sim
-noString=N\u00E3o
-propertyName=Nome da Propriedade
-value=Valor
-requiresRestart=Restart necess\u00E1rio?
-welcomeTitle=Bem vindo ao RHQ\!
-welcomeMessage=Bem vindo \u00E0 instala\u00E7\u00E3o do RHQ. Utilize esta p\u00E1gina \npara instalar e configurar o Servidor RHQ. \nAp\u00F3s completar a instala\u00E7\u00E3o voc\u00EA poder\u00E1 se autenticar e usar o RHQ.
-starting=Iniciando, por favor aguarde...
-alreadyInstalled=RHQ ser\u00E1 instalado\!
-alreadyInstalledStartedLink=Pronto\! Clique aqui para come\u00E7ar\!
-startInstallingLink=Clique aqui para continuar a instala\u00E7\u00E3o.
-backToSettingsLink=Retornar \u00E0 p\u00E1gina de configura\u00E7\u00E3o
-showAdvancedSettings=Mostrar configura\u00E7\u00F5es avan\u00E7adas
-propertyDatabaseType=Tipo de Banco de Dados
-propertyDatabaseConnectionUrl=URL de conex\u00E3o do Banco de Dados
-propertyDatabaseUserName=Usu\u00E1rio do Banco de Dados
-propertyDatabasePassword=Senha do Banco de Dados
-propertyEmbeddedRHQAgentEnabled=Agente embutido habilitado
-propertyEmbeddedRHQAgentName=Nome do Agente embutido
-propertyEmbeddedRHQAgentDisableNativeSystem=Desabilitar sistema nativo no Agente embutido
-propertyEmbeddedRHQAgentResetConfiguration=Reconfigurar Agente embutido
-propertyOperationTimeout=Timeout padr\u00E3o para invocar uma opera\u00E7\u00E3o
-introduceHelpDocs=Favor consultar a documenta\u00E7\u00E3o atrav\u00E9s dos links abaixo para saber mais a respeito do RHQ\:
-helpDocRHQServerInstallGuideLabel=RHQ Server - Guia de Instala\u00E7\u00E3o
-helpDocRHQGuiConsoleUsersGuideLabel=RHQ GUI Console - Guia do Usu\u00E1rio
-helpDocRHQServerUsersGuideLabel=RHQ Server - Guia do Usu\u00E1rio
-helpDocRHQAgentUsersGuideLabel=RHQ Agent - Guia do Usu\u00E1rio
-helpDocFaqLabel=Perguntas Frequentes (FAQ)
-newServerSelectItem=Novo Servidor
-registeredServersLabel=Servidores Registrados
-propertyHighAvailabilityName=Nome do Servidor
-propertyMaintenanceModeAtStart=Modo de manuten\u00E7\u00E3o na Inicializa\u00E7\u00E3o
-propertyHighAvailabilityEndpointAddress=Endere\u00E7o p\u00FAblico do Servidor
-propertyHighAvailabilityAffinityGroup=Nome do Grupo de Afinidade do Servidor
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties
deleted file mode 100644
index 8878300..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-createDatabaseUserTitle=\u521b\u5efa\u6570\u636e\u5e93/\u7528\u6237
-createDatabaseUserHelp=\u5728\u8fd9\u91cc\u8f93\u5165\u7ba1\u7406\u5458\u4fe1\u606f,\u70b9\u51fb\u6309\u94ae\u6765\u521b\u5efa\u4e00\u4e2a\u6570\u636e\u5e93\u548c\u7528\u6237.
-adminConnectionUrl=DB\u8fde\u63a5URL
-adminUsername=\u6570\u636e\u5e93\u7ba1\u7406\u5458\u540d\u79f0
-adminPassword=\u6570\u636e\u5e93\u7ba1\u7406\u5458\u5bc6\u7801
-experimentalDb=\u5df2\u9009\u7684\u6570\u636e\u5e93\u53ea\u80fd\u7528\u6765\u4f5c\u6f14\u793a\u76ee\u7684.\u4e0d\u5e94\u8be5\u7528\u4e8e\u6b63\u5f0f\u4ea7\u54c1\u4f7f\u7528. \u4f7f\u7528H2\u6216MS SQL\u5c06\u6ca1\u6709\u5b89\u88c5\u652f\u6301.
-createDatabaseNote=\u5982\u679c\u4e0d\u5b58\u5728,\u5c06\u521b\u5efa\u6570\u636e\u5e93/\u7528\u6237
-createDatabaseButton=\u521b\u5efa\u6570\u636e\u5e93
-testDatabaseNote=\u9a8c\u8bc1\u6570\u636e\u5e93\u914d\u7f6e
-testDatabaseButton=\u6d4b\u8bd5\u8fde\u63a5
-existingSchemaQuestion=\u6307\u5b9a\u7684\u6570\u636e\u5e93\u5b58\u5728.\u5c06\u5982\u4f55\u64cd\u4f5c?
-existingSchemaAnswerOverwrite=\u8986\u76d6 (\u8986\u76d6\u5df2\u5b58\u5728\u6570\u636e)
-existingSchemaAnswerUpgrade=\u4fdd\u7559 (\u7ef4\u62a4\u5b58\u5728\u6570\u636e)
-existingSchemaAnswerSkip=\u8df3\u8fc7 (\u4e0d\u505a\u4efb\u4f55\u64cd\u4f5c)
-invalidNumber=\u5c5e\u6027{0}\u662f\u65e0\u6548\u6570\u5b57[{1}]
-invalidBoolean=\u5e03\u5c14\u503c{0}\u5e94\u8be5\u662f'true'\u6216'false'\u800c\u4e0d\u5e94\u662f[{1}]
-invalidString=\u5c5e\u6027{0}\u5fc5\u987b\u8bbe\u7f6e.
-saveFailure=\u4fdd\u5b58\u5c5e\u6027\u5b8c\u5168\u90e8\u7f72\u5931\u8d25 - RHQ\u5c06\u4e0d\u80fd\u6b63\u5e38\u5de5\u4f5c\n\
-\u539f\u56e0: {0}
-errorLabel=\u9519\u8bef
-saveError=\u56e0\u672a\u77e5\u539f\u56e0\u65e0\u6cd5\u4fdd\u5b58\u8bbe\u7f6e.
-invalidDatabaseSettings=\u65e0\u6cd5\u8fde\u63a5\u5230\u7ed9\u5b9a\u6570\u636e\u5e93. \n\
-\u8bf7\u68c0\u67e5\u6570\u636e\u5e93\u914d\u7f6e\u5e76\u4e14\u786e\u8ba4\u6570\u636e\u5e93\u5728\u8fd0\u884c\u4e2d.
-setPropertiesInstructions=\u8fd9\u662fRHQ\u670d\u52a1\u5668\u5b89\u88c5\u7684\u914d\u7f6e\u8bbe\u7f6e. \n\
-\u4f60\u53ef\u4ee5\u6309\u9700\u5b9a\u5236. \u5355\u51fb\u4e0d\u540c\u9009\u9879\u540d\u67e5\u770b\u5e2e\u52a9. \u5bf9\u4e8e\u6807\u8bb0\u4e3a"\u9700\u8981\u91cd\u542f"\u7684\u9009\u9879 \n\
-\u9700\u8981\u91cd\u542f\u624d\u80fd\u751f\u6548. \u6240\u4ee5\u5b89\u88c5\u5b8c\u6210\u540e,\u8981\u9a6c\u4e0a\u91cd\u542f\u670d\u52a1\u5668.
-advancedSettingsInstructions=\u5355\u51fb\u4e0b\u9762\u590d\u9009\u6846\u67e5\u770b\u6807\u51c6\u8bbe\u7f6e\u548c\u9ad8\u7ea7\u8bbe\u7f6e.
-installButtonsText=\u5355\u51fb'\u5b89\u88c5\u4ea7\u54c1'\u5f00\u59cb\u666e\u901a\u5b89\u88c5.\n\
-\u5355\u51fb\u6309\u94ae'\u5d4c\u5165\u5f0f\u5b89\u88c5'\u5c06\u5feb\u901f\u7684\u521b\u5efa\u4e00\u4e2a\u5e26\u6709\u6570\u636e\u5e93\u548c\u5d4c\u5165\u7684Agent\u7684\u5b8c\u6574\u73af\u5883.\u5d4c\u5165\u5f0f\u5b89\u88c5\u53ea\u80fd\u7528\u6765\u6f14\u793a\u6216\u8bc4\u4f30!
-orText=-- or --
-saveEmbeddedMode=\u5d4c\u5165\u5f0f\u5b89\u88c5
-databaseSettingsInstructions=\u6570\u636e\u5e93\u914d\u7f6e. \u6240\u6709\u4fe1\u606f\u90fd\u8981\u8f93\u5165. \u4f7f\u7528\u6309\u94ae"\u6d4b\u8bd5\u8fde\u63a5"\u6765\u9a8c\u8bc1\u8bbe\u7f6e.
-installSettingsInstructions= \u5b9a\u4e49\u9700\u8981\u7684\u670d\u52a1\u5668\u4fe1\u606f.
-installSettingsNote1=\u5982\u679c\u5347\u7ea7\u6216\u91cd\u88c5\u8bf7\u5728\u5217\u8868\u4e2d\u9009\u62e9\u6ce8\u518c\u7684\u670d\u52a1\u5668:
-installSettingsNote2=\u5982\u679c\u5b89\u88c5\u4e00\u4e2a\u65b0\u670d\u52a1\u5668\u8bf7\u5728\u4e0b\u9762\u8f93\u5165\u670d\u52a1\u5668\u7aef\u914d\u7f6e:
-serverSettingsInstructions=\u4ee5\u4e0b\u9009\u9879\u90fd\u662f\u5fc5\u987b\u7684.
-save=\u5b89\u88c5\u670d\u52a1\u5668!
-yesString=\u662f
-noString=\u5426
-propertyName=\u5c5e\u6027\u540d
-value=\u503c
-requiresRestart=\u9700\u8981\u91cd\u542f?
-welcomeTitle=\u6b22\u8fce\u4f7f\u7528RHQ!
-welcomeMessage=\u5f00\u59cb\u5b89\u88c5RHQ. \u8fd9\u4e2a\u9875\u9762\u7528\u6765\n\
-\u5b89\u88c5\u914d\u7f6eRHQ\u670d\u52a1\u5668. \n\
-\u5b89\u88c5\u5b8c\u6210\u4ee5\u540e,\u5c06\u53ef\u4ee5\u767b\u5f55\u4f7f\u7528RHQ.
-starting=\u8fdb\u884c\u4e2d,\u8bf7\u7b49\u5f85 ...
-alreadyInstalled=RHQ\u5c06\u8981\u5b89\u88c5!
-alreadyInstalledStartedLink=\u5b8c\u6210!\u70b9\u51fb\u6b64\u5904\u5f00\u59cb!
-startInstallingLink=\u7ee7\u7eed\u5b89\u88c5\u8bf7\u70b9\u51fb\u8fd9\u91cc
-backToSettingsLink=\u8fd4\u56de\u914d\u7f6e\u9875\u9762
-showAdvancedSettings=\u663e\u793a\u9ad8\u7ea7\u9009\u9879
-propertyDatabaseType=\u6570\u636e\u5e93\u7c7b\u578b
-propertyDatabaseConnectionUrl=\u6570\u636e\u5e93\u8fde\u63a5URL
-propertyDatabaseDriverClass=\u6570\u636e\u5e93JDBC\u9a71\u52a8
-propertyDatabaseXADataSourceClass=\u6570\u636e\u5e93XA\u6570\u636e\u6e90\u7c7b
-propertyDatabaseUserName=\u6570\u636e\u5e93\u7528\u6237\u540d
-propertyDatabasePassword=\u6570\u636e\u5e93\u5bc6\u7801
-propertyBindAddress=\u670d\u52a1\u5668\u76d1\u542c\u5730\u5740
-propertyHttpPort=HTTP\u7aef\u53e3
-propertyHttpsPort=\u5b89\u5168HTTPS\u7aef\u53e3
-propertyWebServicePort=Web Service\u7aef\u53e3
-propertyNamingServicePort=Naming Service\u7aef\u53e3
-propertyNamingServiceRmiPort=Naming Service RMI\u7aef\u53e3
-propertyJrmpInvokerRmiPort=JRMP Invoker RMI\u7aef\u53e3
-propertyPooledInvokerRmiPort=Pooled Invoker RMI\u7aef\u53e3
-propertyAjpPort=AJP\u7aef\u53e3
-propertyUnifiedInvokerPort=\u7edf\u4e00Invoker\u7aef\u53e3
-propertyAspectDeployerPort=Aspect Deployer\u7aef\u53e3
-propertyTomcatClientAuthMode=Tomcat\u5ba2\u6237\u7aef\u6388\u6743\u6a21\u5f0f
-propertyTomcatAlgorithm=Tomcat Keystore/Truststore\u7b97\u6cd5
-propertyTomcatKeystoreFilename=Tomcat Keystore
-propertyTomcatKeystorePassword=Tomcat Keystore\u5bc6\u7801
-propertyTomcatKeystoreType=Tomcat Keystore\u7c7b\u578b
-propertyTomcatKeystoreAlias=Tomcat Keystore Alias
-propertyTomcatTruststoreFilename=Tomcat Truststore
-propertyTomcatTruststorePassword=Tomcat Truststore\u5bc6\u7801
-propertyTomcatTruststoreType=Tomcat Truststore\u7c7b\u578b
-propertyTomcatSslProtocol=Tomcat SSL\u534f\u8bae
-propertyConnectorTransport=\u63a5\u6536Agent\u901a\u4fe1\u4f20\u8f93
-propertyConnectorBindAddress=\u63a5\u6536Agent\u901a\u4fe1\u76d1\u542c\u5730\u5740
-propertyConnectorBindPort=\u63a5\u6536Agent\u901a\u4fe1\u7aef\u53e3
-propertyConnectorTransportParams=\u63a5\u6536Agent\u901a\u4fe1\u4f20\u8f93\u53c2\u6570
-propertyAgentMulticastDetectorEnabled=\u542f\u7528Agent\u591a\u64ad\u63a2\u6d4b\u5668
-propertyAgentMulticastDetectorBindAddress=Agent\u591a\u64ad\u63a2\u6d4b\u5668\u76d1\u542c\u5730\u5740
-propertyAgentMulticastDetectorMulticastAddress=Agent \u7ec4\u64ad\u5730\u5740\u591a\u64ad\u63a2\u6d4b\u5668
-propertyAgentMulticastDetectorPort=Agent\u591a\u64ad\u63a2\u6d4b\u5668\u7aef\u53e3
-propertySecurityServerSecureSocketProtocol=\u63a5\u6536\u5b89\u5168 - \u5b89\u5168Socket\u534f\u8bae
-propertySecurityServerKeystoreFile=\u63a5\u6536\u5b89\u5168 - Keystore\u6587\u4ef6
-propertySecurityServerKeystoreAlgorithm=\u63a5\u6536\u5b89\u5168 - Keystore\u7b97\u6cd5
-propertySecurityServerKeystoreType=\u63a5\u6536\u5b89\u5168 - Keystore\u7c7b\u578b
-propertySecurityServerKeystorePassword=\u63a5\u6536\u5b89\u5168 - Keystore\u5bc6\u7801
-propertySecurityServerKeystoreKeyPassword=\u63a5\u6536\u5b89\u5168 - Keystore Key\u5bc6\u7801
-propertySecurityServerKeystoreAlias=\u63a5\u6536\u5b89\u5168 - Keystore Alias
-propertySecurityServerTruststoreFile=\u63a5\u6536\u5b89\u5168 - Truststore\u6587\u4ef6
-propertySecurityServerTruststoreAlgorithm=\u63a5\u6536\u5b89\u5168 - Truststore\u7b97\u6cd5
-propertySecurityServerTruststoreType=\u63a5\u6536\u5b89\u5168 - Truststore\u7c7b\u578b
-propertySecurityServerTruststorePassword=\u63a5\u6536\u5b89\u5168 - Truststore\u5bc6\u7801
-propertySecurityServerClientAuthMode=\u63a5\u6536\u5b89\u5168 - \u5ba2\u6237\u7aef\u6388\u6743\u6a21\u5f0f
-propertySecurityClientSecureSocketProtocol=\u5916\u53d1\u5b89\u5168 - \u5b89\u5168Socket\u534f\u8bae
-propertySecurityClientKeystoreFile=\u5916\u53d1\u5b89\u5168 - Keystore\u6587\u4ef6
-propertySecurityClientKeystoreAlgorithm=\u5916\u53d1\u5b89\u5168 - Keystore\u7b97\u6cd5
-propertySecurityClientKeystoreType=\u5916\u53d1\u5b89\u5168 - Keystore\u7c7b\u578b
-propertySecurityClientKeystorePassword=\u5916\u53d1\u5b89\u5168 - Keystore\u5bc6\u7801
-propertySecurityClientKeystoreKeyPassword=\u5916\u53d1\u5b89\u5168 - Keystore Key\u5bc6\u7801
-propertySecurityClientKeystoreAlias=\u5916\u53d1\u5b89\u5168 - Keystore Alias
-propertySecurityClientTruststoreFile=\u5916\u53d1\u5b89\u5168 - Truststore\u6587\u4ef6
-propertySecurityClientTruststoreAlgorithm=\u5916\u53d1\u5b89\u5168 - Truststore\u7b97\u6cd5
-propertySecurityClientTruststoreType=\u5916\u53d1\u5b89\u5168 - Truststore\u7c7b\u578b
-propertySecurityClientTruststorePassword=\u5916\u53d1\u5b89\u5168 - Truststore\u5bc6\u7801
-propertySecurityClientServerAuthModeEnabled=\u5916\u53d1\u5b89\u5168 - \u542f\u7528\u670d\u52a1\u5668\u6388\u6743\u6a21\u5f0f
-propertyEmbeddedRHQAgentEnabled=\u542f\u7528\u5d4c\u5165Agent
-propertyEmbeddedRHQAgentName=\u5d4c\u5165Agent\u540d\u79f0
-propertyEmbeddedRHQAgentDisableNativeSystem=\u5d4c\u5165Agent\u7981\u7528\u672c\u5730\u7cfb\u7edf
-propertyEmbeddedRHQAgentResetConfiguration=\u5d4c\u5165Agent\u91cd\u7f6e\u914d\u7f6e
-propertyEmailSmtpHost=\u90ae\u4ef6SMTP\u4e3b\u673a\u540d
-propertyEmailSmtpPort=\u90ae\u4ef6SMTP\u7aef\u53e3
-propertyEmailFromAddress=\u53d1\u9001\u90ae\u4ef6\u5730\u5740
-propertyOperationTimeout=\u9ed8\u8ba4Operation Invocation\u8d85\u65f6\u65f6\u95f4
-propertyClusterPartitionName=\u96c6\u7fa4 - Partition Name
-propertyClusterPartitionBindAddress=\u96c6\u7fa4 - Partition\u76d1\u542c\u5730\u5740
-propertyClusterUdpGroup=\u96c6\u7fa4 - Partition UDP Multicast Group IP\u5730\u5740
-propertyClusterHaPartitionPort=\u96c6\u7fa4 - Partition UDP\u591a\u64ad\u7aef\u53e3
-propertyClusterEjb3CachePort=\u96c6\u7fa4 - Partition UDP EJB3\u5b9e\u4f53\u7f13\u5b58\u591a\u64ad\u7aef\u53e3
-propertyClusterAlertCachePort=\u96c6\u7fa4 - Partition UDP\u544a\u8b66\u7f13\u5b58\u591a\u64ad\u7aef\u53e3
-propertyClusterUdpLoopback=\u96c6\u7fa4 - Partition UDP\u56de\u73af
-propertyClusterHaJndiPort=\u96c6\u7fa4 - HA JNDI\u7aef\u53e3
-propertyClusterHaJndiRmiPort=\u96c6\u7fa4 - HA JNDI RMI\u7aef\u53e3
-propertyClusterHaJndiAutoDiscoveryPort=\u96c6\u7fa4 - HA JNDI\u81ea\u52a8\u53d1\u73b0\u7ec4\u7aef\u53e3
-propertyClusterHaJrmpInvokerRmiPort=\u96c6\u7fa4 - HA JRMP Invoker RMI\u7aef\u53e3
-propertyClusterHaPooledInvokerPort=\u96c6\u7fa4 - HA Pooled Invoker\u7aef\u53e3
-propertyClusterJGroupsUdpIpTtl=\u96c6\u7fa4 - JGroups UDP IP\u5b58\u6d3b\u65f6\u95f4
-propertyConcurrencyLimitWebConns=\u5e76\u53d1\u6570\u9650\u5236 - \u6700\u5927Web\u8fde\u63a5\u6570
-propertyConcurrencyLimitGlobal=\u5e76\u53d1\u6570\u9650\u5236 - \u5168\u5c40
-propertyConcurrencyLimitInventoryReport=\u5e76\u53d1\u6570\u9650\u5236 - \u6e05\u5355\u62a5\u8868
-propertyConcurrencyLimitAvailabilityReport=\u5e76\u53d1\u6570\u9650\u5236 - \u53ef\u7528\u6027\u62a5\u8868
-propertyConcurrencyLimitInventorySync=\u5e76\u53d1\u6570\u9650\u5236 - \u6e05\u5355\u540c\u6b65
-propertyConcurrencyLimitContentReport=\u5e76\u53d1\u6570\u9650\u5236 - Content\u62a5\u8868
-propertyConcurrencyLimitContentDownload=\u5e76\u53d1\u6570\u9650\u5236 - Content\u4e0b\u8f7d
-propertyConcurrencyLimitMeasurementReport=\u5e76\u53d1\u6570\u9650\u5236 - \u6027\u80fd\u62a5\u8868
-propertyConcurrencyLimitMeasurementScheduleRequest=\u5e76\u53d1\u6570\u9650\u5236 - Measurement Schedule\u8bf7\u6c42
-introduceHelpDocs=\u60f3\u66f4\u591a\u4e86\u89e3RHQ,\u8bf7\u67e5\u770b\u4e0b\u9762\u7684\u6587\u6863\u94fe\u63a5:
-helpDocRHQServerInstallGuide=\u5b89\u88c5
-helpDocRHQServerInstallGuideLabel=RHQ\u670d\u52a1\u5668\u5b89\u88c5\u6307\u5357
-helpDocRHQGuiConsoleUsersGuide=GUI+Console+Users+Guide
-helpDocRHQGuiConsoleUsersGuideLabel=RHQ GUI Console\u7528\u6237\u6307\u5357
-helpDocRHQServerUsersGuide=Running+the+RHQ+Server
-helpDocRHQServerUsersGuideLabel=RHQ\u670d\u52a1\u5668\u7528\u6237\u6307\u5357
-helpDocRHQAgentUsersGuide=Running+the+RHQ+Agent
-helpDocRHQAgentUsersGuideLabel=RHQ Agent\u7528\u6237\u6307\u5357
-helpDocFaq=FAQ
-helpDocFaqLabel=\u7591\u96be\u89e3\u7b54
-newServerSelectItem=\u65b0\u670d\u52a1\u5668
-registeredServersLabel=\u6ce8\u518c\u7684\u670d\u52a1\u5668:
-propertyHighAvailabilityName=\u670d\u52a1\u5668\u540d\u79f0
-propertyMaintenanceModeAtStart=\u542f\u52a8\u7ef4\u62a4\u6a21\u5f0f
-propertyHighAvailabilityEndpointAddress=\u670d\u52a1\u5668\u516c\u5171\u5730\u5740
-propertyHighAvailabilityAffinityGroup=\u76f8\u4f3c\u7684\u670d\u52a1\u5668\u7ec4\u540d
diff --git a/modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties b/modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties
deleted file mode 100644
index f323a0e..0000000
--- a/modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-shortName = ${product.shortName}
-name = ${product.name}
-fullName = ${product.fullName}
-version = ${product.version}
-buildNumber = ${buildNumber}
-url = ${product.url}
-urlDomain = ${product.urlDomain}
-supportEmail = ${product.supportEmail}
-salesEmail = ${product.salesEmail}
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml b/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 577489e..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<faces-config version="1.2"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
- <managed-bean>
- <managed-bean-name>configurationBean</managed-bean-name>
- <managed-bean-class>org.rhq.enterprise.installer.ConfigurationBean</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-
- <navigation-rule>
- <from-view-id>/start.jsp</from-view-id>
- <navigation-case>
- <from-outcome>STAY</from-outcome>
- <to-view-id>/start.jsp</to-view-id>
- <redirect/>
- </navigation-case>
- <navigation-case>
- <from-outcome>CREATEDB</from-outcome>
- <to-view-id>/createdb.jsp</to-view-id>
- <redirect/>
- </navigation-case>
- <navigation-case>
- <from-outcome>SUCCESS</from-outcome>
- <to-view-id>/welcome.jsp</to-view-id>
- <redirect/>
- </navigation-case>
- <navigation-case>
- <from-outcome>DBINVALID</from-outcome>
- <to-view-id>/invalid_database.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>ERROR</from-outcome>
- <to-view-id>/save_error.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/createdb.jsp</from-view-id>
- <navigation-case>
- <from-outcome>STAY</from-outcome>
- <to-view-id>/start.jsp</to-view-id>
- <redirect/>
- </navigation-case>
- </navigation-rule>
-
- <application>
- <message-bundle>InstallerMessages</message-bundle>
- <resource-bundle>
- <base-name>InstallerMessages</base-name>
- <var>i18nmsg</var>
- </resource-bundle>
- <locale-config>
- <default-locale>en</default-locale>
- <supported-locale>de</supported-locale>
- <supported-locale>fr</supported-locale>
- <supported-locale>pt</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ko</supported-locale>
- </locale-config>
- </application>
-
-</faces-config>
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/jboss-web.xml b/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/jboss-web.xml
deleted file mode 100644
index 493bdbf..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-
-<jboss-web>
- <context-root>/installer</context-root>
-</jboss-web>
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8742506..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <display-name>RHQ Server Installer</display-name>
- <description>RHQ Server Installer</description>
-
- <!-- JSF RI -->
-
- <listener>
- <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
- </listener>
-
- <!-- flags for debugging during development -->
- <context-param>
- <param-name>com.sun.faces.validateXml</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>com.sun.faces.verifyObjects</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <!-- JSF non-impl-specific -->
-
- <!-- the suffix for files containing JSF content (default is ".jsp") -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.jsp</param-value>
- </context-param>
-
- <!-- list of additional JSF config files (in addition to "/WEB-INF/faces-config.xml") -->
- <context-param>
- <param-name>javax.faces.application.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/navigation.xml</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- this servlet checks to see if the server is preconfigured; if so, it performs auto-install -->
- <servlet>
- <servlet-name>Autoinstaller Servlet</servlet-name>
- <servlet-class>org.rhq.enterprise.installer.AutoInstallServlet</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>/index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/createdb.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/createdb.jsp
deleted file mode 100644
index 7b00972..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/createdb.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%@ page contentType="text/html" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<f:view>
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
-<html>
- <head>
- <link rel="stylesheet" type="text/css" href="style.css" />
- <title><h:outputText value="#{bundle.createDatabaseUserTitle}"/></title>
-
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <meta http-equiv="Cache-Control" content="no-cache" />
- </head>
-
- <body>
- <p align="center">
- <h:graphicImage url="/images/logo.png" alt="RHQ logo"/>
- </p>
-
- <h1 align="center"><h:outputText value="#{bundle.createDatabaseUserTitle}" /></h1>
- <h:form>
- <h:panelGrid columns="1" style="margin-left: auto; margin-right: auto; text-align: center;">
- <h:outputText value="#{bundle.createDatabaseUserHelp}"/>
-
- <h:panelGrid columns="2" rowClasses="evenRow,oddRow" style="margin-left: auto; margin-right: auto; text-align: center;">
- <h:outputText value="#{bundle.adminConnectionUrl}" />
- <h:inputText value="#{configurationBean.adminConnectionUrl}" size="40"/>
-
- <h:outputText value="#{bundle.adminUsername}" />
- <h:inputText value="#{configurationBean.adminUsername}" size="40"/>
-
- <h:outputText value="#{bundle.adminPassword}" />
- <h:inputSecret value="#{configurationBean.adminPassword}" size="40" />
- </h:panelGrid>
-
- <h:commandButton id="createDatabaseButton" action="#{configurationBean.createDatabase}" value="#{bundle.createDatabaseButton}" />
- </h:panelGrid>
- </h:form>
- </body>
-
-</html>
-
-</f:view>
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
deleted file mode 100644
index f76a72c..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
+++ /dev/null
@@ -1,108 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
-
-<%@page import="org.rhq.enterprise.installer.ServerInformation"%>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
- <head>
- <link rel="stylesheet" type="text/css" href="style.css" />
- <title><h:outputText value="#{bundle.welcomeTitle}" /></title>
-
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <meta http-equiv="Cache-Control" content="no-cache" />
-
- <%-- we only do our AJAX forwarding to the login page if fully deployed but not on the installer start page --%>
- <c:if test="<%= new ServerInformation().isFullyDeployed() && request.getRequestURI().indexOf("installer/start") == -1 %>">
- <script type="text/javascript" language="JavaScript">
-
- var startPage = '/startupstatus';
- var xmlRequest = false;
-
- function doLoad()
- {
- setTimeout( "refresh()", 15*1000 )
-
- try
- {
- if (window.XMLHttpRequest)
- {
- xmlRequest = new XMLHttpRequest(); // Firefox, Safari, ...
- }
- else if (window.ActiveXObject)
- {
- xmlRequest = new ActiveXObject("Microsoft.XMLHTTP"); // Internet Explorer
- }
- }
- catch (e)
- {
- xmlRequest = false;
- }
-
- if ( !xmlRequest )
- {
- return false;
- }
-
- xmlRequest.onreadystatechange = processStateChange;
- xmlRequest.open('HEAD', startPage, true);
- xmlRequest.send(null);
- }
-
- function processStateChange()
- {
- if (xmlRequest.readyState == 4)
- {
- // 288 means page is OK (note, we don't use 200 because of https://issues.jboss.org/browse/JBWEB-188),
- // 401 means we are being asked to authenticate the user in either case, it means the RHQ Console is ready
- if (xmlRequest.status == 288 || xmlRequest.status == 401)
- {
- linkText = "${bundle.alreadyInstalledStartedLink}";
- reminderText = "${bundle.alreadyInstalledReminder}";
- productInstalled = "${bundle.alreadyInstalled}";
- reminderContent ='';
- if(productInstalled.indexOf("RHQ")==-1){
- reminderContent = '<br/><br/><b>'+reminderText+'</b><br/>';
- }
- document.getElementById('pleasewait-image').src="/images/finished.gif";
- document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>'+reminderContent;
- // this will immediately forward to the start page, uncomment if we want that functionality
- // window.location.replace( startPage );
- }
- }
- }
-
- function refresh()
- {
- doLoad();
- }
- </script>
- </c:if>
-
- <script type="text/javascript" language="JavaScript">
- function popUp(url, title)
- {
- window.open(url, title, 'toolbar=0,scrollbars=1,location=1,statusbar=0,menubar=0,resizable=1');
- }
- </script>
-
- </head>
-
- <c:choose>
- <c:when test="<%= new ServerInformation().isFullyDeployed() && request.getRequestURI().indexOf("installer/start") == -1 %>">
- <body onload="doLoad()">
- </c:when>
- <c:otherwise>
- <body>
- </c:otherwise>
- </c:choose>
-
- <p align="center">
- <h:graphicImage url="/images/logo.png" alt="logo"/>
- </p>
-
- <h1 align="left"><h:outputText value="#{bundle.welcomeTitle}" /></h1>
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/images/finished.gif b/modules/enterprise/gui/installer-war/src/main/webapp/images/finished.gif
deleted file mode 100644
index 2cb3ab1..0000000
Binary files a/modules/enterprise/gui/installer-war/src/main/webapp/images/finished.gif and /dev/null differ
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/images/logo.png b/modules/enterprise/gui/installer-war/src/main/webapp/images/logo.png
deleted file mode 100644
index 6850b02..0000000
Binary files a/modules/enterprise/gui/installer-war/src/main/webapp/images/logo.png and /dev/null differ
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/images/ok.gif b/modules/enterprise/gui/installer-war/src/main/webapp/images/ok.gif
deleted file mode 100644
index d64379c..0000000
Binary files a/modules/enterprise/gui/installer-war/src/main/webapp/images/ok.gif and /dev/null differ
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/images/pleasewait.gif b/modules/enterprise/gui/installer-war/src/main/webapp/images/pleasewait.gif
deleted file mode 100644
index d04f463..0000000
Binary files a/modules/enterprise/gui/installer-war/src/main/webapp/images/pleasewait.gif and /dev/null differ
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/images/warning.gif b/modules/enterprise/gui/installer-war/src/main/webapp/images/warning.gif
deleted file mode 100644
index 9bff6db..0000000
Binary files a/modules/enterprise/gui/installer-war/src/main/webapp/images/warning.gif and /dev/null differ
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/index.html b/modules/enterprise/gui/installer-war/src/main/webapp/index.html
deleted file mode 100644
index 2b0686c..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Welcome to RHQ!</title>
-
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Expires" content="-1" />
-<meta http-equiv="Cache-Control" content="no-cache" />
-
-<script type="text/javascript" language="JavaScript">
-<!--
-window.location = "/installer/welcome.jsf"
-//-->
-</script>
-
-<style type="text/css">
- body {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white; background: #781F1C;
- }
- h1 {
- font-size: 100%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white;
- }
- p {
- font-size: 75%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white;
- }
- .javascriptWarning {
- font-size: 100%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: red; background: yellow;
- }
-</style>
-
-</head>
-<body>
- <p> </p>
- <h1 align="center">RHQ Requires JavaScript!</h1>
- <noscript>
- <p class="javascriptWarning" align="center">THE RHQ SERVER CONSOLE REQUIRES YOUR BROWSER TO HAVE JAVASCRIPT ENABLED.<br/>
- YOU WILL NOT BE ABLE TO PROPERLY ACCESS RHQ UNTIL YOU ENABLE JAVASCRIPT.</p>
- </noscript>
- <p> </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/invalid_database.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/invalid_database.jsp
deleted file mode 100644
index fa8bb15..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/invalid_database.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ page contentType="text/html" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-
-<f:view>
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
-<html>
-
- <f:subview id="header">
- <jsp:include page="/header.jsp" flush="true"/>
- </f:subview>
-
- <p align="center">
- <h:outputText value="#{bundle.invalidDatabaseSettings}" />
- </p>
-
- <p align="center">
- <h:outputLink value="start.jsf">
- <h:outputText value="#{bundle.backToSettingsLink}" />
- </h:outputLink>
- </p>
-
- </body>
-</html>
-
-</f:view>
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/save_error.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/save_error.jsp
deleted file mode 100644
index 369b474..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/save_error.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%@ page contentType="text/html" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-
-<f:view>
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
-<html>
-
- <f:subview id="header">
- <jsp:include page="/header.jsp" flush="true" />
- </f:subview>
-
- <p align="center">
- <h:outputText value="#{bundle.saveError}" />
- </p>
-
- <table align="center" border="1">
- <tr><th><h:outputText value="#{bundle.errorLabel}" /></th></tr>
- <tr><td><h:outputText value="#{configurationBean.lastError}" /></td></tr>
- </table>
-
- <p align="center">
- <h:outputLink value="start.jsf"><h:outputText value="#{bundle.backToSettingsLink}"/></h:outputLink>
- </p>
-
- </body>
-
-</html>
-
-</f:view>
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
deleted file mode 100644
index 7bbb55c..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
+++ /dev/null
@@ -1,352 +0,0 @@
-<%@ page contentType="text/html" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-
-<f:view>
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
-<html>
- <head>
- <script type="text/javascript">
- function hideDiv( _levelId) {
- var thisDiv = document.getElementById( _levelId );
- thisDiv.style.display = "none";
- }
-
- function showDiv( _levelId) {
- var thisDiv = document.getElementById( _levelId );
- thisDiv.style.display = "block";
- }
- function checkForPassword() {
- if ( document.getElementById('propForm:databasepassword').value == '' ) {
- alert("Please enter database password.");
- return false;
- }
- return true;
- }
- </script>
- </head>
-
- <body>
- <f:subview id="header">
- <jsp:include page="/header.jsp" flush="true" />
- </f:subview>
-
- <p align="left">
- <h:outputText value="#{bundle.setPropertiesInstructions}" />
- </p>
-
- <h:form>
- <p align="left">
- <h4 align="left">
- <h:outputText value="#{bundle.advancedSettingsInstructions}" />
- </h4>
- <h:selectBooleanCheckbox onclick="submit()"
- id="showAdvancedSettings"
- value="#{configurationBean.showAdvancedSettings}" />
- <h:outputLabel for="showAdvancedSettings"
- value="#{bundle.showAdvancedSettings}" />
- </p>
- </h:form>
-
- <h:form id="propForm">
- <br/>
- <h4 align="left">
- <h:outputText value="#{bundle.databaseSettingsInstructions}" />
- </h4>
- <div id="experimentalDbMsg" style="display: none;">
- <table>
- <tr>
- <td><img alt="warning" src="images/warning.gif"/></td>
- <td><h:outputText value="#{bundle.experimentalDb}" styleClass="javascriptWarning"/></td>
- </tr>
- </table>
-
- </div>
-
- <h:panelGrid columns="1">
- <h:panelGrid columns="2"
- rowClasses="evenRow,oddRow">
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[0].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[0].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:selectOneMenu id="databasetype"
- value="#{configurationBean.databaseConfiguration[0].value}"
- onchange="document.getElementById('propForm:databaseusername').value = 'rhqadmin';
- document.getElementById('propForm:databasepassword').value = 'rhqadmin';
-
- if (this.options[this.selectedIndex].value == 'PostgreSQL'){
- document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:postgresql://127.0.0.1:5432/rhq';
- document.getElementById('propForm:databasedriverclass').value = 'org.postgresql.Driver';
- document.getElementById('propForm:databasexadatasourceclass').value = 'org.postgresql.xa.PGXADataSource';
- hideDiv('experimentalDbMsg');
- } else if (this.options[this.selectedIndex].value == 'Oracle') {
- document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:oracle:thin:@127.0.0.1:1521:rhq';
- document.getElementById('propForm:databasedriverclass').value = 'oracle.jdbc.driver.OracleDriver';
- document.getElementById('propForm:databasexadatasourceclass').value = 'oracle.jdbc.xa.client.OracleXADataSource';
- hideDiv('experimentalDbMsg');
- } else if (this.options[this.selectedIndex].value == 'H2') {
- document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:h2:#{configurationBean.dataDirectory}/rhq;MVCC=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOG=2';
- document.getElementById('propForm:databasedriverclass').value = 'org.h2.Driver';
- document.getElementById('propForm:databasexadatasourceclass').value = 'org.h2.jdbcx.JdbcDataSource';
- alert('#{bundle.experimentalDb}');
- showDiv('experimentalDbMsg');
- } else if (this.options[this.selectedIndex].value == 'sqlserver') {
- document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:jtds:sqlserver://localhost:1433;databaseName=rhq';
- document.getElementById('propForm:databasedriverclass').value = 'net.sourceforge.jtds.jdbc.Driver';
- document.getElementById('propForm:databasexadatasourceclass').value = 'net.sourceforge.jtds.jdbcx.JtdsDataSource';
- alert('#{bundle.experimentalDb}');
- showDiv('experimentalDbMsg');
- } else if (this.options[this.selectedIndex].value == 'MySQL') {
- document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:mysql://127.0.0.1/rhq';
- document.getElementById('propForm:databasedriverclass').value = 'com.mysql.jdbc.Driver';
- document.getElementById('propForm:databasexadatasourceclass').value = 'com.mysql.jdbc.jdbc2.optional.MysqlXADataSource';
- alert('#{bundle.experimentalDb}');
- showDiv('experimentalDbMsg');
- }
- ">
- <f:selectItems value="#{configurationBean.databaseConfiguration[0].itemDefinition.options}" />
- </h:selectOneMenu>
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[1].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[1].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:inputText id="databaseconnectionurl"
- size="#{configurationBean.databaseConfiguration[1].itemDefinition.fieldSize}"
- value="#{configurationBean.databaseConfiguration[1].value}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[2].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[2].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:inputText id="databasedriverclass"
- size="#{configurationBean.databaseConfiguration[2].itemDefinition.fieldSize}"
- value="#{configurationBean.databaseConfiguration[2].value}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[3].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[3].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:inputText id="databasexadatasourceclass"
- size="#{configurationBean.databaseConfiguration[3].itemDefinition.fieldSize}"
- value="#{configurationBean.databaseConfiguration[3].value}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[4].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[4].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:inputText id="databaseusername"
- size="#{configurationBean.databaseConfiguration[4].itemDefinition.fieldSize}"
- value="#{configurationBean.databaseConfiguration[4].value}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.databaseConfiguration[5].itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{configurationBean.databaseConfiguration[5].itemDefinition.propertyLabel}" />
- </h:outputLink>
- <h:inputSecret id="databasepassword"
- size="#{configurationBean.databaseConfiguration[5].itemDefinition.fieldSize}"
- value="#{configurationBean.databaseConfiguration[5].value}" />
- </h:panelGrid>
-
- <h:panelGrid columns="2" border="1">
- <h:panelGrid columns="1">
- <h:outputText value="#{bundle.testDatabaseNote}" style="font-size: 100%"/>
- <h:panelGrid columns="2">
- <h:commandButton id="testDatabaseButton"
- onclick="if (!checkForPassword()) return false"
- action="#{configurationBean.testConnection}"
- value="#{bundle.testDatabaseButton}"/>
- <h:panelGroup rendered="#{configurationBean.lastTest != null && configurationBean.lastTest != 'OK'}">
- <h:graphicImage value="/images/warning.gif" alt="Error" onclick="alert('#{configurationBean.lastTest}')" onmouseover="this.style.cursor='pointer'" onmouseout="this.style.cursor='default'"/>
- </h:panelGroup>
- <h:panelGroup rendered="#{configurationBean.lastTest != null && configurationBean.lastTest == 'OK'}">
- <h:graphicImage value="/images/ok.gif" alt="OK"/>
- </h:panelGroup>
- </h:panelGrid>
- </h:panelGrid>
-
-<%-- this is confusing people, don't show this
- <h:panelGrid columns="1">
- <h:outputText value="#{bundle.createDatabaseNote}" style="font-size: 100%"/>
- <h:panelGrid columns="2">
- <h:commandButton id="createDatabaseButton" action="#{configurationBean.showCreateDatabasePage}" value="#{bundle.createDatabaseButton}" />
- <h:panelGroup rendered="#{configurationBean.lastCreate != null && configurationBean.lastCreate != 'OK'}">
- <h:graphicImage value="/images/warning.gif" alt="Error" onclick="alert('#{configurationBean.lastCreate}')" onmouseover="this.style.cursor='pointer'" onmouseout="this.style.cursor='default'"/>
- </h:panelGroup>
- <h:panelGroup rendered="#{configurationBean.lastCreate != null && configurationBean.lastCreate == 'OK'}">
- <h:graphicImage value="/images/ok.gif" alt="OK"/>
- </h:panelGroup>
- </h:panelGrid>
- </h:panelGrid>
---%>
- </h:panelGrid>
- </h:panelGrid>
-
- <h:panelGrid columns="2" columnClasses="warningColor" rendered="#{configurationBean.databaseSchemaExist == true}">
- <h:outputText value="#{bundle.existingSchemaQuestion}" style="font-size: 80%"/>
- <h:selectOneMenu onchange="submit()" label="#{bundle.existingSchemaQuestion}" value="#{configurationBean.existingSchemaOption}">
- <f:selectItems value="#{configurationBean.existingSchemaOptions}" />
- </h:selectOneMenu>
- </h:panelGrid>
-
-
- <br/>
- <h4 align="left">
- <h:outputText value="#{bundle.installSettingsInstructions}" />
- </h4>
- <h:panelGrid columns="1">
- <h:panelGrid columns="1" rendered="#{configurationBean.registeredServers == true}" >
-
- <h:outputText value="#{bundle.installSettingsNote1}" />
- <br/>
-
- <h:panelGrid columns="2" >
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}-RegisteredServers', 'propertyHelp')" >
- <h:outputText value="#{bundle.registeredServersLabel}" />
- </h:outputLink>
- <h:selectOneMenu value="#{configurationBean.selectedRegisteredServerName}"
- onchange="{ document.getElementById('propForm:haservername').value = this.options[this.selectedIndex].value;
- document.getElementById('propForm:haendpointaddress').value = '';
- document.getElementById('propForm:haendpointport').value = '';
- document.getElementById('propForm:haendpointsecureport').value = '';
- if (document.getElementById('propForm:haaffinitygroup') != null) {
- document.getElementById('propForm:haaffinitygroup').value = '';
- }
- submit(); }" >
- <f:selectItems value="#{configurationBean.registeredServerNames}" />
- </h:selectOneMenu>
-
- </h:panelGrid>
-
- <br/>
- <h:outputText value="#{bundle.installSettingsNote2}" />
-
- </h:panelGrid>
-
-
- <h:panelGrid columns="3" headerClass="evenRow" rowClasses="evenRow,oddRow">
-
- <h:outputText value=" " />
- <h:outputText value=" " />
- <h:outputText value="#{bundle.requiresRestart}" style="font-weight:bold" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.propHaServerName.itemDefinition.help}', 'propertyHelp')" >
- <h:outputText value="#{bundle.propertyHighAvailabilityName}" />
- </h:outputLink>
- <h:inputText id="haservername" size="#{configurationBean.propHaServerName.itemDefinition.fieldSize}"
- value="#{configurationBean.haServerName}" readonly="#{not configurationBean.installationSettingsConfigurable}">
- </h:inputText>
- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaServerName.itemDefinition.requiresRestart}" />
- <h:outputText value="#{bundle.noString}" rendered="#{!configurationBean.propHaServerName.itemDefinition.requiresRestart}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}-ServerPublicAddress', 'propertyHelp')" >
- <h:outputText value="#{bundle.propertyHighAvailabilityEndpointAddress}" />
- </h:outputLink>
- <h:inputText id="haendpointaddress" size="#{configurationBean.propHaServerName.itemDefinition.fieldSize}"
- value="#{configurationBean.haServer.endpointAddress}" >
- </h:inputText>
- <h:outputText value="#{bundle.noString}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.propHaEndpointPort.itemDefinition.help}', 'propertyHelp')" >
- <h:outputText value="#{bundle.propertyHttpPort}" />
- </h:outputLink>
- <h:inputText id="haendpointport" size="#{configurationBean.propHaEndpointPort.itemDefinition.fieldSize}"
- value="#{configurationBean.haServer.endpointPortString}" >
- </h:inputText>
- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointPort.itemDefinition.requiresRestart}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{configurationBean.propHaEndpointSecurePort.itemDefinition.help}', 'propertyHelp')" >
- <h:outputText value="#{bundle.propertyHttpsPort}" />
- </h:outputLink>
- <h:inputText id="haendpointsecureport" size="#{configurationBean.propHaEndpointSecurePort.itemDefinition.fieldSize}"
- value="#{configurationBean.haServer.endpointSecurePortString}" >
- </h:inputText>
- <h:outputText value="#{bundle.yesString}" rendered="#{configurationBean.propHaEndpointSecurePort.itemDefinition.requiresRestart}" />
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}-ServerAffinityGroup', 'propertyHelp')"
- rendered="#{configurationBean.showAdvancedSettings == true}" >
- <h:outputText value="#{bundle.propertyHighAvailabilityAffinityGroup}" />
- </h:outputLink>
- <h:inputText id="haaffinitygroup" size="#{configurationBean.propHaServerName.itemDefinition.fieldSize}"
- value="#{configurationBean.haServer.affinityGroup}"
- rendered="#{configurationBean.showAdvancedSettings == true}" >
- </h:inputText>
- <h:outputText value="#{bundle.noString}" rendered="#{configurationBean.showAdvancedSettings == true}" />
-
- </h:panelGrid>
- </h:panelGrid>
-
- <br/>
- <h4 align="left">
- <h:outputText value="#{bundle.serverSettingsInstructions}" />
- </h4>
- <h:dataTable value="#{configurationBean.nonDatabaseConfiguration}" var="prop"
- headerClass="evenRow" rowClasses="oddRow,evenRow">
- <h:column>
- <f:facet name="header">
- <h:outputText value="" />
- </f:facet>
-
- <h:outputLink value="javascript:popUp('#{bundle.helpDocRHQServerPropParentPage}#{prop.itemDefinition.help}', 'propertyHelp')">
- <h:outputText value="#{prop.itemDefinition.propertyLabel}" />
- </h:outputLink>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="" />
- </f:facet>
- <h:inputText size="#{prop.itemDefinition.fieldSize}"
- value="#{prop.value}"
- rendered="#{prop.itemDefinition.options == null && (prop.itemDefinition.propertyType.name eq 'java.lang.Integer' || prop.itemDefinition.propertyType.name eq 'java.net.InetAddress')}" />
- <h:inputText size="#{prop.itemDefinition.fieldSize}"
- value="#{prop.value}"
- rendered="#{prop.itemDefinition.options == null && (prop.itemDefinition.propertyType.name eq 'java.lang.String' && !prop.itemDefinition.secret)}" />
- <h:inputSecret size="#{prop.itemDefinition.fieldSize}"
- value="#{prop.value}"
- rendered="#{prop.itemDefinition.options == null && (prop.itemDefinition.propertyType.name eq 'java.lang.String' && prop.itemDefinition.secret)}" />
- <h:selectOneRadio value="#{prop.value}"
- rendered="#{prop.itemDefinition.options == null && (prop.itemDefinition.propertyType.name eq 'java.lang.Boolean')}">
- <f:selectItem itemLabel="#{bundle.yesString}" itemValue="true"/>
- <f:selectItem itemLabel="#{bundle.noString}" itemValue="false"/>
- </h:selectOneRadio>
- <h:selectOneMenu value="#{prop.value}"
- rendered="#{prop.itemDefinition.options != null}">
- <f:selectItems value="#{prop.itemDefinition.options}" />
- </h:selectOneMenu>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{bundle.requiresRestart}" />
- </f:facet>
- <h:outputText value="#{bundle.yesString}" rendered="#{prop.itemDefinition.requiresRestart}" />
- <h:outputText value="#{bundle.noString}" rendered="#{!prop.itemDefinition.requiresRestart}" />
- </h:column>
- </h:dataTable>
-
- <br/>
- <p align="left">
-<%-- this is confusing people, don't show this
- <h4 align="left">
- <h:outputText value="#{bundle.installButtonsText}" />
- </h4>
- <table border="1"><tr>
- <td><h:commandButton id="save" action="#{configurationBean.save}" value="#{bundle.save}" /></td>
- <td><h:outputText value="#{bundle.orText}" /></td>
- <td><h:commandButton id="saveEmbeddedMode" action="#{configurationBean.saveEmbeddedMode}" value="#{bundle.saveEmbeddedMode}" /></td>
- </tr></table>
---%>
- <table border="1"><tr>
- <td><h:commandButton id="save"
- onclick="if (!checkForPassword()) return false"
- action="#{configurationBean.save}"
- value="#{bundle.save}" />
- </td>
- </tr></table>
- </p>
- </h:form>
-
- </body>
-
-</html>
-
-</f:view>
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/style.css b/modules/enterprise/gui/installer-war/src/main/webapp/style.css
deleted file mode 100644
index dbfdf19..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/style.css
+++ /dev/null
@@ -1,32 +0,0 @@
-body {
- font-family: Verdana, Tahoma, Geneva, Helvetica, Arial, sans-serif;
- color: #444444;
- font-size: 12px;
-}
-table {
- font-size: 12px;
-}
-a:link, a:visited {
- color: #781F1C;
- text-decoration: underline;
-}
-a:hover, a:active {
- color: #222222;
- text-decoration: none;
-}
-.oddRow, .evenRow {
- font-family: Verdana, Helvetica, Arial, sans-serif;
-}
-.oddRow {
- color: #444444; background: #DDDDDD;
-}
-.evenRow {
- color: #444444; background: #FFFFFF;
-}
-.javascriptWarning {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: red; background: yellow;
-}
-.warningColor {
- color: red; background: yellow;
-}
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp
deleted file mode 100644
index 94328ad..0000000
--- a/modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ page contentType="text/html" %>
-
-<%@page import="org.rhq.enterprise.installer.ServerInformation"%>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<f:view>
-<f:loadBundle var="bundle" basename="InstallerMessages" />
-
-<html>
-
- <f:subview id="header">
- <jsp:include page="/header.jsp" flush="true"/>
- </f:subview>
-
- <c:if test="<%= new ServerInformation().isFullyDeployed() %>">
- <p align="left"><h:outputText value="#{bundle.alreadyInstalled}" /></p>
- <table align="left">
- <tr>
- <td align="left">
- <h:graphicImage id="pleasewait-image" url="/images/pleasewait.gif" alt="..."/><br/>
- </td>
- </tr>
- <tr>
- <td align="left" id="progressBarMessage">
- <h:outputText styleClass="small" value="#{bundle.starting}" />
- </td>
- </tr>
- </table>
- <br/>
- <br/>
- <br/>
- <br/>
- </c:if>
-
- <c:if test="<%= !new ServerInformation().isFullyDeployed() %>">
- <p align="left"><h:outputText value="#{bundle.welcomeMessage}" /></p>
- <p align="left">
- <li><h:outputLink value="start.jsf"><h:outputText value="#{bundle.startInstallingLink}" /></h:outputLink></li>
- </p>
- <br/>
- </c:if>
-
- <br/><br/>
- <hr align="left" style="width: 30%">
- <br/>
-
- <p align="left">
- <h:outputText value="#{bundle.introduceHelpDocs}"/>
- </p>
-
- <table align="left"><tr><td>
-
- <li><h:outputLink target="_blank" value="#{bundle.helpDocRoot}#{bundle.helpDocRHQServerInstallGuide}"><h:outputText value="#{bundle.helpDocRHQServerInstallGuideLabel}"/></h:outputLink></li>
- <%--
- <li><h:outputLink target="_blank" value="#{bundle.helpDocRoot}#{bundle.helpDocRHQGuiConsoleUsersGuide}"><h:outputText value="#{bundle.helpDocRHQGuiConsoleUsersGuideLabel}"/></h:outputLink></li>
- --%>
- <li><h:outputLink target="_blank" value="#{bundle.helpDocRoot}#{bundle.helpDocRHQServerUsersGuide}"><h:outputText value="#{bundle.helpDocRHQServerUsersGuideLabel}"/></h:outputLink></li>
- <li><h:outputLink target="_blank" value="#{bundle.helpDocRoot}#{bundle.helpDocRHQAgentUsersGuide}"><h:outputText value="#{bundle.helpDocRHQAgentUsersGuideLabel}"/></h:outputLink></li>
- <li><h:outputLink target="_blank" value="#{bundle.helpDocRoot}#{bundle.helpDocFaq}"><h:outputText value="#{bundle.helpDocFaqLabel}"/></h:outputLink></li>
-
- </td></tr></table>
-
- </body>
-
-</html>
-
-</f:view>
\ No newline at end of file
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
deleted file mode 100644
index 20dbbc0..0000000
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.enterprise.installer;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import org.rhq.core.util.stream.StreamUtil;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import org.rhq.core.db.reset.DBReset;
-import org.rhq.core.db.setup.DBSetup;
-
-/**
- * The tests in this class exercise the dbsetup/dbupgrade code that is run in the installer. The tests currently only
- * run against postgresql. Support needs to be added for oracle. The tests do not do any post-install/upgrade
- * verification at the time of this writing. They just simply exercise the dbsetup/dbupgrade scripts to ensure that
- * they do not contain any errors.
- *
- * @author John Sanda
- */
-public class DBInstallationTest {
-
- private final String LOG_DIRECTORY = System.getProperty("java.io.tmpdir", "rhq/installer-test");
- private final String DB_NAME = System.getProperty("rhq.test.ds.db-name", "rhq_installer_test_db");
- private final String USERNAME = System.getProperty("rhq.test.ds.user-name", "rhqadmin");
- private final String PASSWORD = System.getProperty("rhq.test.ds.password", "rhqadmin");
- private final String SERVER = System.getProperty("rhq.test.ds.server-name", "127.0.0.1");
- private final String DB_URL = System.getProperty("rhq.test.ds.connection-url", "jdbc:postgresql://" + SERVER
- + ":5432/" + DB_NAME);
- private final String ADMIN_USERNAME = System.getProperty("rhq.db.admin.username", "postgres");
- private final String ADMIN_PASSWORD = System.getProperty("rhq.db.admin.password", "postgres");
- private static final String DB_TYPE_MAPPING = System.getProperty("rhq.test.ds.type-mapping", "PostgreSQL");
-
- private ServerInformation installer;
-
- @BeforeMethod
- public void prepareForInstallation() throws Exception {
- initLogDirectory();
- recreateTestDatabase();
-
- installer = new ServerInformation();
- installer.setLogDirectory(new File(LOG_DIRECTORY));
- }
-
- @AfterMethod
- public void afterInstallation() throws Exception {
- recreateTestDatabase();
- installer.createNewDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void overwriteJON240Schema() throws Exception {
- installSchemaAndData("2.4.0");
- installer.createNewDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void upgradeJON240Schema() throws Exception {
- installSchemaAndData("2.4.0");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void overwriteJON300Schema() throws Exception {
- installSchemaAndData("3.0.0");
- installer.createNewDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void upgradeJON300Schema() throws Exception {
- installSchemaAndData("3.0.0");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void upgradeRHQ420Schema() throws Exception {
- installSchemaAndData("rhq-4.2.0");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
- @Test
- public void upgradeRHQ430Schema() throws Exception {
- installSchemaAndData("rhq-4.3.0");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
- private void initLogDirectory() {
- File logDir = new File(LOG_DIRECTORY);
- if (logDir.exists()) {
- logDir.delete();
- }
- logDir.mkdirs();
- }
-
- private void recreateTestDatabase() throws Exception {
- DBReset dbReset = new DBReset();
- dbReset.performDBReset(DB_TYPE_MAPPING, DB_URL, DB_NAME, USERNAME, ADMIN_USERNAME, ADMIN_PASSWORD);
- }
-
- private void installSchemaAndData(String jonVersion) throws Exception {
- DBSetup dbsetup = new DBSetup(DB_URL, USERNAME, PASSWORD);
- File schemaFile = getSchemaFile(jonVersion);
- dbsetup.setup(schemaFile.getAbsolutePath());
- File dataFile = getDataFile(jonVersion);
- dbsetup.setup(dataFile.getAbsolutePath());
- }
-
- private File getSchemaFile(String version) throws Exception {
- URL url = getClass().getResource("db-schema-combined-" + version + ".xml");
-
- if (url == null) {
- throw new RuntimeException("Failed to find schema file for version " + version);
- }
-
- File file = new File(url.toURI().getPath());
- File filteredFile = filterXmlFile(file, getInstallProperties());
-
- return filteredFile;
- }
-
- private File getDataFile(String version) throws Exception {
- URL url = getClass().getResource("db-data-combined-" + version + ".xml");
-
- if (url == null) {
- throw new RuntimeException("Failed to find data file for version " + version);
- }
-
- File file = new File(url.toURI().getPath());
- File filteredFile = filterXmlFile(file, getInstallProperties());
-
- return filteredFile;
- }
-
- private Properties getInstallProperties() {
- Properties dbProperties = new Properties();
- dbProperties.put(ServerProperties.PROP_DATABASE_CONNECTION_URL, DB_URL);
- dbProperties.put(ServerProperties.PROP_DATABASE_USERNAME, USERNAME);
- dbProperties.put(ServerProperties.PROP_DATABASE_PASSWORD, PASSWORD);
- dbProperties.put(ServerProperties.PROP_EMAIL_FROM_ADDRESS, "rhqadmin(a)localhost.com");
- return dbProperties;
- }
-
- private static File filterXmlFile(File xmlFile, Properties props) throws IOException {
- // first slurp the file contents in memory
- InputStream fileInStream = new FileInputStream(xmlFile);
- ByteArrayOutputStream contentOutStream = new ByteArrayOutputStream();
- StreamUtil.copy(fileInStream, contentOutStream);
-
- // now replace their replacement strings with values from the properties
- String content = contentOutStream.toString();
- content = content.replaceAll("@@@LARGE_TABLESPACE_FOR_DATA@@@", "DEFAULT");
- content = content.replaceAll("@@@LARGE_TABLESPACE_FOR_INDEX@@@", "DEFAULT");
- content = content.replaceAll("@@@ADMINUSERNAME@@@", "rhqadmin");
- content = content.replaceAll("@@@ADMINPASSWORD@@@", "x1XwrxKuPvYUILiOnOZTLg=="); // rhqadmin
- content = content.replaceAll("@@@ADMINEMAIL@@@", props.getProperty(ServerProperties.PROP_EMAIL_FROM_ADDRESS));
- content = content.replaceAll("@@@BASEURL@@@", "http://" + ServerProperties.getValidServerBindAddress(props)
- + ":" + ServerProperties.getHttpPort(props) + "/");
- content = content.replaceAll("@@@JAASPROVIDER@@@", "JDBC");
- content = content.replaceAll("@@@LDAPURL@@@", "ldap://localhost/");
- content = content.replaceAll("@@@LDAPPROTOCOL@@@", "");
- content = content.replaceAll("@@@LDAPLOGINPROP@@@", "cn");
- content = content.replaceAll("@@@LDAPBASEDN@@@", "o=JBoss,c=US");
- content = content.replaceAll("@@@LDAPSEARCHFILTER@@@", "");
- content = content.replaceAll("@@@LDAPBINDDN@@@", "");
- content = content.replaceAll("@@@LDAPBINDPW@@@", "");
- content = content.replaceAll("@@@MULTICAST_ADDR@@@", "");
- content = content.replaceAll("@@@MULTICAST_PORT@@@", "");
-
- // we now have the finished XML content - write out the file to the tmp directory
- File filteredXmlFile = File.createTempFile("rhq", xmlFile.getName());
- FileOutputStream xmlFileOutStream = new FileOutputStream(xmlFile);
- ByteArrayInputStream contentInStream = new ByteArrayInputStream(content.getBytes());
- StreamUtil.copy(contentInStream, xmlFileOutStream);
-
- return xmlFile.getAbsoluteFile();
- }
-
-}
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.4.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.4.0.xml
deleted file mode 100644
index 15978a6..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.4.0.xml
+++ /dev/null
@@ -1,669 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="data.xml">
-<!-- BEGIN: rhq-data.xml -->
-<!-- BEGIN: auth-data.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
- <data id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
- </table>
-
-<!-- END: auth-data.xml -->
-<!-- BEGIN: authz-data.xml -->
-
-
- <!-- the overlord user -->
- <table name="RHQ_SUBJECT">
- <data ID="1"
- NAME="admin"
- FIRST_NAME="Super"
- LAST_NAME="User"
- FSYSTEM="TRUE"/>
- </table>
-
- <!-- the initial rhqadmin user -->
- <table name="RHQ_SUBJECT">
- <data ID="2"
- NAME="rhqadmin"
- FIRST_NAME="RHQ"
- LAST_NAME="Administrator"
- EMAIL_ADDRESS="rhqadmin@localhost"
- FSYSTEM="FALSE"/>
- </table>
-
- <!-- Define the system root role which includes our overlord and rhqadmin users -->
- <table name="RHQ_ROLE">
- <data ID="1"
- NAME="Super User Role"
- FSYSTEM="TRUE"
- DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
- <data ID="2"
- NAME="All Resources Role"
- FSYSTEM="FALSE"
- DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
- </table>
-
- <!-- associate the root users with all security permissions -->
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <data SUBJECT_ID="1" ROLE_ID="1"/>
- <!-- overlord user -->
- <data SUBJECT_ID="2" ROLE_ID="1"/>
- <!-- rhqadmin user -->
- </table>
-
- <table name="RHQ_PERMISSION">
- <!-- give super-user-role all permissions (resource perms is mainly just to show on view-role page) -->
- <data ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
- <data ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
- <data ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <!-- resource permissions start here-->
- <data ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE -->
-
- <!-- give all-resources-role all permissions (resource perms is mainly just to show on view-role page) -->
- <data ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <!-- resource permissions start here-->
- <data ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE -->
- </table>
-
-<!-- END: authz-data.xml -->
-<!-- BEGIN: search-data.xml -->
-
-
- <!-- overlord-created, global, default saved searches -->
- <table name="RHQ_SAVED_SEARCH">
- <data ID="1"
- CONTEXT="RESOURCE"
- NAME="Downed Platforms"
- DESCRIPTION="All downed machines across the entire enterprise"
- PATTERN="availability=down category=platform"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- <data ID="2"
- CONTEXT="RESOURCE"
- NAME="Downed Servers"
- DESCRIPTION="All downed servers across the entire enterprise"
- PATTERN="availability=down category=server"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- </table>
-
-<!-- END: search-data.xml -->
-<!-- BEGIN: sysconfig-data.xml -->
-
-
- <!--
- This file contains the seed data for the configuration table.
- All keys mentioned here should be referenced via the RHQConstants class
- -->
- <table name="RHQ_SYSTEM_CONFIG">
- <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="3.0.0.GA"
- DEFAULT_PROPERTY_VALUE="3.0.0.GA" FREAD_ONLY="TRUE"/>
- <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.91"
- DEFAULT_PROPERTY_VALUE="2.91" FREAD_ONLY="TRUE"/>
- <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
- DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
- <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://127.0.0.1:7080/"
- DEFAULT_PROPERTY_VALUE="http://127.0.0.1:7080/" FREAD_ONLY="FALSE"/>
- <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
- DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
- <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
- DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
-
- <!-- default LDAP configuration options -->
- <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
- PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- FREAD_ONLY="FALSE"/>
- <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
- PROPERTY_VALUE="ldap://localhost/"
- DEFAULT_PROPERTY_VALUE="ldap://localhost/"
- FREAD_ONLY="FALSE"/>
- <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
- PROPERTY_VALUE="cn"
- DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
- <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
- PROPERTY_VALUE="o=JBoss,c=US"
- DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
- FREAD_ONLY="FALSE"/>
- <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
- <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
-
- <!-- Does this build support Syslog actions? -->
- <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
- PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
- FREAD_ONLY="FALSE"/>
- <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
- <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- Default data storage options -->
- <!-- Default 14 days -->
- <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
- PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 31 days -->
- <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
- PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 1 year -->
- <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
- PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
- FREAD_ONLY="FALSE"/>
-
- <!-- Baseline options -->
- <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
- <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
- PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
- FREAD_ONLY="FALSE"/>
- <!-- How much data to include in the calulation, default 7 days -->
- <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
- PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
- FREAD_ONLY="FALSE"/>
-
- <!-- ID 31 has been deleted -->
-
- <!-- How often to run database maintainence routines -->
- <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
- PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep RT data around -->
- <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- Whether to reindex the data tables nightly -->
- <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep alerts around -->
- <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep events around (1209600000 millis == 14 days) -->
- <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
- DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
- <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="900000"
- DEFAULT_PROPERTY_VALUE="900000" FREAD_ONLY="FALSE"/>
-
- <!-- Will our server-cloud support agents auto-updating themselves? -->
- <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How old does a trait have to be in order to get purged -->
- <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <!-- How old does availability have to be in order to get purged -->
- <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- </table>
-
-<!-- END: sysconfig-data.xml -->
-<!-- BEGIN: measurement-data.xml -->
-
- <table name="RHQ_NUMBERS">
- <data i="0"/>
- <data i="1"/>
- <data i="2"/>
- <data i="3"/>
- <data i="4"/>
- <data i="5"/>
- <data i="6"/>
- <data i="7"/>
- <data i="8"/>
- <data i="9"/>
- <data i="10"/>
- <data i="11"/>
- <data i="12"/>
- <data i="13"/>
- <data i="14"/>
- <data i="15"/>
- <data i="16"/>
- <data i="17"/>
- <data i="18"/>
- <data i="19"/>
- <data i="20"/>
- <data i="21"/>
- <data i="22"/>
- <data i="23"/>
- <data i="24"/>
- <data i="25"/>
- <data i="26"/>
- <data i="27"/>
- <data i="28"/>
- <data i="29"/>
- <data i="30"/>
- <data i="31"/>
- <data i="32"/>
- <data i="33"/>
- <data i="34"/>
- <data i="35"/>
- <data i="36"/>
- <data i="37"/>
- <data i="38"/>
- <data i="39"/>
- <data i="40"/>
- <data i="41"/>
- <data i="42"/>
- <data i="43"/>
- <data i="44"/>
- <data i="45"/>
- <data i="46"/>
- <data i="47"/>
- <data i="48"/>
- <data i="49"/>
- <data i="50"/>
- <data i="51"/>
- <data i="52"/>
- <data i="53"/>
- <data i="54"/>
- <data i="55"/>
- <data i="56"/>
- <data i="57"/>
- <data i="58"/>
- <data i="59"/>
- </table>
-
-<!-- END: measurement-data.xml -->
-<!-- BEGIN: content-data.xml -->
-
- <table name="RHQ_ARCHITECTURE">
- <data id="1" name="noarch"/>
- <data id="2" name="i386"/>
- <data id="3" name="i486"/>
- <data id="4" name="i586"/>
- <data id="5" name="i686"/>
- <data id="6" name="alpha"/>
- <data id="7" name="alphaev6"/>
- <data id="8" name="ia64"/>
- <data id="9" name="sparc"/>
- <data id="10" name="sparcv9"/>
- <data id="11" name="sparc64"/>
- <data id="12" name="src"/>
- <data id="13" name="s390"/>
- <data id="14" name="athlon"/>
- <data id="15" name="s390x"/>
- <data id="16" name="ppc"/>
- <data id="17" name="ppc64"/>
- <data id="18" name="pSeries"/>
- <data id="19" name="iSeries"/>
- <data id="20" name="x86_64"/>
- <data id="21" name="ppc64iseries"/>
- <data id="22" name="ppc64pseries"/>
- <data id="23" name="sparc-solaris"/>
- <data id="24" name="sparc.sun4u-solaris"/>
- <data id="25" name="tar"/>
- <data id="26" name="ia32e"/>
- <data id="27" name="amd64"/>
- <data id="28" name="i386-solaris"/>
- <data id="29" name="nosrc"/>
- <data id="30" name="sparc-solaris-patch"/>
- <data id="31" name="i386-solaris-patch"/>
- <data id="32" name="sparc-solaris-patch-cluster"/>
- <data id="33" name="i386-solaris-patch-cluster"/>
- <data id="34" name="noarch-solaris"/>
- <data id="35" name="noarch-solaris-patch"/>
- <data id="36" name="noarch-solaris-patch-cluster"/>
- <data id="37" name="solaris-patch"/>
- <data id="38" name="solaris-patch-cluster"/>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <data id="1" name="family"/>
- </table>
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <data id="1" name="parent"/>
- <data id="2" name="clone"/>
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <data id="1" name="kickstart" description="Linux kickstart distribution"/>
- <data id="2" name="jumpstart" description="solaris jumpstart distribution"/>
- </table>
-
-<!-- END: content-data.xml -->
-<!-- BEGIN: jms-data.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-<!-- the data must match that which is expected in conf/login-config.xml -->
-
-
- <table name="JMS_USERS">
- <data USERID="guest" PASSWD="guest" />
- </table>
-
- <table name="JMS_ROLES">
- <data ROLEID="guest" USERID="guest" />
- </table>
-
-<!-- END: jms-data.xml -->
-<!-- END: rhq-data.xml -->
-<!-- BEGIN: jon-data.xml -->
-
-<!-- This dbsetup config file defines a content source and
- associated repo for the JBoss CSP RSS patch feed. -->
-
-
- <!-- ********* metadata (the content source type and its config def) ********* -->
-
- <table name="RHQ_CONFIG_DEF">
- <data ID="101"
- NAME="JBoss CSP Patch Feed Content Source"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <data ID="101"
- NAME="url"
- DISPLAY_NAME="Feed URL"
- DESCRIPTION="URL of the feed (e.g. https://support.redhat.com/jbossnetwork/restricted/feed/software.html?pro...)."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="0"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="102"
- NAME="username"
- DISPLAY_NAME="Username"
- DESCRIPTION="Username used to access the feed URL."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="1"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="103"
- NAME="password"
- DISPLAY_NAME="Password"
- DESCRIPTION="Password used to access the feed URL."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="2"
- SIMPLE_TYPE="PASSWORD"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="104"
- NAME="active"
- DISPLAY_NAME="Active"
- DESCRIPTION="Indicates if the feed should be checked for new patches."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="3"
- SIMPLE_TYPE="BOOLEAN"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="105"
- NAME="proxyUrl"
- DISPLAY_NAME="Proxy URL"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="4"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="106"
- NAME="proxyPort"
- DISPLAY_NAME="Proxy Port"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="5"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="107"
- NAME="proxyUsername"
- DISPLAY_NAME="Proxy Username"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="6"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="108"
- NAME="proxyPassword"
- DISPLAY_NAME="Proxy Password"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="7"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- </table>
-
- <!-- NOTE: The values of the NAME, PLUGIN_NAME, and API_CLASS columns must match what is
- defined in RHQ/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml. -->
- <!-- default sync chedule: 1st of every month at 12am -->
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <data ID="101"
- NAME="JBossASPatchSource"
- DISPLAY_NAME="JBoss Patch Content Source"
- DESCRIPTION="a content source that retrieves package metadata from an RSS feed; the feed must be in the format used by the JBoss CSP"
- PLUGIN_NAME="JBossASPatchContentSourcePlugin"
- DEFAULT_LAZY_LOAD="1"
- DEFAULT_DOWNLOAD_MODE="DATABASE"
- DEFAULT_SYNC_SCHEDULE="0 0 0 1 * ?"
- API_CLASS="org.rhq.enterprise.server.plugins.jboss.software.JBossSoftwareContentSourceAdapter"
- SOURCE_CONFIG_DEF_ID="101"/>
- </table>
-
-
- <!-- the default template -->
- <table name="RHQ_CONFIG">
- <data ID="101"
- VERSION="0"
- CTIME="1270066600000"
- MTIME="1270066600000"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <data ID="101"
- NAME="url"
- CONFIGURATION_ID="101"
- STRING_VALUE=""
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="102"
- NAME="username"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="103"
- NAME="password"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="104"
- NAME="proxyUrl"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="105"
- NAME="proxyPort"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="106"
- NAME="active"
- CONFIGURATION_ID="101"
- STRING_VALUE="true"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="107"
- NAME="proxyUsername"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="108"
- NAME="proxyPassword"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <data ID="101"
- NAME="default"
- DESCRIPTION="the default initial values for the configuration of a JBossASPatchSource content source"
- CONFIG_ID="101"
- CONFIG_DEF_ID="101"
- IS_DEFAULT="1"/>
- </table>
-
-
- <!-- ********* data (the content source and its config) ********* -->
-
- <table name="RHQ_CONFIG">
- <data ID="102"
- VERSION="0"
- CTIME="1270066600000"
- MTIME="1270066600000"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <data ID="111"
- NAME="url"
- CONFIGURATION_ID="102"
- STRING_VALUE="https://support.redhat.com/jbossnetwork/restricted/feed/software.html?pro..."
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="112"
- NAME="username"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="113"
- NAME="password"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="114"
- NAME="proxyUrl"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="115"
- NAME="proxyPort"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="116"
- NAME="active"
- CONFIGURATION_ID="102"
- STRING_VALUE="false"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="117"
- NAME="proxyUsername"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="118"
- NAME="proxyPassword"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- </table>
-
- <!-- sync chedule: 1st of every month at 12am -->
- <table name="RHQ_CONTENT_SOURCE">
- <data ID="101"
- NAME="JBoss CSP Patch Feed"
- DESCRIPTION="an RSS feed published by the JBoss Customer Service Portal (CSP) website which provides a list of all JBoss product patches available for the subscription of a given CSP user; the feed entries for most cumulative patches (CPs) include automated install instructions that can be used by JON to install those CPs to inventoried server Resources (e.g. JBoss EAP servers)"
- LAZY_LOAD="1"
- DOWNLOAD_MODE="DATABASE"
- SYNC_SCHEDULE="0 0 0 1 * ?"
- CREATION_TIME="1270066600000"
- LAST_MODIFIED_TIME="1270066600000"
- CONTENT_SOURCE_TYPE_ID="101"
- CONFIGURATION_ID="102"/>
- </table>
-
- <!-- sync chedule: every Mon at 1am -->
- <table name="RHQ_REPO">
- <data ID="101"
- NAME="JBoss Patches"
- DESCRIPTION="the patches obtained from the JBoss CSP patch feed"
- SYNC_SCHEDULE="0 0 1 ? * 1"
- CREATION_TIME="1270066600000"
- LAST_MODIFIED_TIME="1270066600000"
- IS_CANDIDATE="0"/>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP">
- <data REPO_ID="101"
- CONTENT_SRC_ID="101"
- CTIME="1270066600000"/>
- </table>
-
-
-<!-- END: jon-data.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml
deleted file mode 100644
index 060f241..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml
+++ /dev/null
@@ -1,690 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="data.xml">
-<!-- BEGIN: rhq-data.xml -->
-<!-- BEGIN: auth-data.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
- <data id="2" PRINCIPAL="@@@ADMINUSERNAME@@@" PASSWORD="@@@ADMINPASSWORD@@@"/>
- </table>
-
-<!-- END: auth-data.xml -->
-<!-- BEGIN: authz-data.xml -->
-
-
- <!-- the overlord user -->
- <table name="RHQ_SUBJECT">
- <data ID="1"
- NAME="admin"
- FIRST_NAME="Super"
- LAST_NAME="User"
- FSYSTEM="TRUE"/>
- </table>
-
- <!-- the initial rhqadmin user -->
- <table name="RHQ_SUBJECT">
- <data ID="2"
- NAME="@@@ADMINUSERNAME@@@"
- FIRST_NAME="RHQ"
- LAST_NAME="Administrator"
- EMAIL_ADDRESS="@@@ADMINEMAIL@@@"
- FSYSTEM="FALSE"/>
- </table>
-
- <!-- Define the system root role which includes our overlord and rhqadmin users -->
- <table name="RHQ_ROLE">
- <data ID="1"
- NAME="Super User Role"
- FSYSTEM="TRUE"
- DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
- <data ID="2"
- NAME="All Resources Role"
- FSYSTEM="FALSE"
- DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
- </table>
-
- <!-- associate the root users with all security permissions -->
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <!-- overlord user -->
- <data SUBJECT_ID="1" ROLE_ID="1"/>
- <!-- rhqadmin user -->
- <data SUBJECT_ID="2" ROLE_ID="1"/>
- </table>
-
- <table name="RHQ_PERMISSION">
- <!-- give super-user-role all permissions
- (explicitly add resource perms, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
- <data ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
- <data ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <data ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
- <!-- resource permissions start here-->
- <data ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="1" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="1" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
-
- <!-- give all-resources-role MANAGE_INVENTORY and MANAGE_BUNDLE permissions
- (explicitly add resource perms as well, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <!-- resource permissions start here-->
- <data ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="2" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="2" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
- </table>
-
-<!-- END: authz-data.xml -->
-<!-- BEGIN: search-data.xml -->
-
-
- <!-- overlord-created, global, default saved searches -->
- <table name="RHQ_SAVED_SEARCH">
- <data ID="1"
- CONTEXT="RESOURCE"
- NAME="Downed Platforms"
- DESCRIPTION="All downed machines across the entire enterprise"
- PATTERN="availability=down category=platform"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- <data ID="2"
- CONTEXT="RESOURCE"
- NAME="Downed Servers"
- DESCRIPTION="All downed servers across the entire enterprise"
- PATTERN="availability=down category=server"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- </table>
-
-<!-- END: search-data.xml -->
-<!-- BEGIN: sysconfig-data.xml -->
-
-
- <!--
- This file contains the seed data for the configuration table.
- All keys mentioned here should be referenced via the RHQConstants class
- -->
- <table name="RHQ_SYSTEM_CONFIG">
- <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="4.2.0.JON300.GA"
- DEFAULT_PROPERTY_VALUE="4.2.0.JON300.GA" FREAD_ONLY="TRUE"/>
- <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.116"
- DEFAULT_PROPERTY_VALUE="2.116" FREAD_ONLY="TRUE"/>
- <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="@@@JAASPROVIDER@@@"
- DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
- <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="@@@BASEURL@@@"
- DEFAULT_PROPERTY_VALUE="@@@BASEURL@@@" FREAD_ONLY="FALSE"/>
- <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
- DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
- <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
- DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
-
- <!-- default LDAP configuration options -->
- <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
- PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- FREAD_ONLY="FALSE"/>
- <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
- PROPERTY_VALUE="@@@LDAPURL@@@"
- DEFAULT_PROPERTY_VALUE="ldap://localhost/"
- FREAD_ONLY="FALSE"/>
- <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
- PROPERTY_VALUE="@@@LDAPLOGINPROP@@@"
- DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
- <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
- PROPERTY_VALUE="@@@LDAPBASEDN@@@"
- DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
- FREAD_ONLY="FALSE"/>
- <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
- PROPERTY_VALUE="@@@LDAPBINDDN@@@"
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
- PROPERTY_VALUE="@@@LDAPBINDPW@@@"
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
- PROPERTY_VALUE="@@@LDAPPROTOCOL@@@" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
- <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
- PROPERTY_VALUE="@@@LDAPSEARCHFILTER@@@" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
-
- <!-- Does this build support Syslog actions? -->
- <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
- PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
- FREAD_ONLY="FALSE"/>
- <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
- <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- Default data storage options -->
- <!-- Default 14 days -->
- <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
- PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 31 days -->
- <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
- PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 1 year -->
- <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
- PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
- FREAD_ONLY="FALSE"/>
-
- <!-- Baseline options -->
- <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
- <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
- PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
- FREAD_ONLY="FALSE"/>
- <!-- How much data to include in the calulation, default 7 days -->
- <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
- PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
- FREAD_ONLY="FALSE"/>
-
- <!-- ID 31 has been deleted -->
-
- <!-- How often to run database maintainence routines -->
- <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
- PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep RT data around -->
- <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- Whether to reindex the data tables nightly -->
- <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep alerts around -->
- <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep events around (1209600000 millis == 14 days) -->
- <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
- DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
- <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="900000"
- DEFAULT_PROPERTY_VALUE="900000" FREAD_ONLY="FALSE"/>
-
- <!-- Will our server-cloud support agents auto-updating themselves? -->
- <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How old does a trait have to be in order to get purged -->
- <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <!-- How old does availability have to be in order to get purged -->
- <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <data ID="56" PROPERTY_KEY="RESOURCE_GENERIC_PROPERTIES_UPGRADE" PROPERTY_VALUE="false"
- DEFAULT_PROPERTY_VALUE="false" FREAD_ONLY="FALSE"/>
-
- <!-- default drift server plugin settings -->
- <data ID="57" PROPERTY_KEY="ACTIVE_DRIFT_PLUGIN" PROPERTY_VALUE="drift-jpa"
- DEFAULT_PROPERTY_VALUE="drift-jpa" FREAD_ONLY="FALSE"/>
-
- <!-- purge drift files older than 31 days by default -->
- <data ID="58" PROPERTY_KEY="DRIFT_FILE_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- </table>
-
-<!-- END: sysconfig-data.xml -->
-<!-- BEGIN: measurement-data.xml -->
-
- <table name="RHQ_NUMBERS">
- <data i="0"/>
- <data i="1"/>
- <data i="2"/>
- <data i="3"/>
- <data i="4"/>
- <data i="5"/>
- <data i="6"/>
- <data i="7"/>
- <data i="8"/>
- <data i="9"/>
- <data i="10"/>
- <data i="11"/>
- <data i="12"/>
- <data i="13"/>
- <data i="14"/>
- <data i="15"/>
- <data i="16"/>
- <data i="17"/>
- <data i="18"/>
- <data i="19"/>
- <data i="20"/>
- <data i="21"/>
- <data i="22"/>
- <data i="23"/>
- <data i="24"/>
- <data i="25"/>
- <data i="26"/>
- <data i="27"/>
- <data i="28"/>
- <data i="29"/>
- <data i="30"/>
- <data i="31"/>
- <data i="32"/>
- <data i="33"/>
- <data i="34"/>
- <data i="35"/>
- <data i="36"/>
- <data i="37"/>
- <data i="38"/>
- <data i="39"/>
- <data i="40"/>
- <data i="41"/>
- <data i="42"/>
- <data i="43"/>
- <data i="44"/>
- <data i="45"/>
- <data i="46"/>
- <data i="47"/>
- <data i="48"/>
- <data i="49"/>
- <data i="50"/>
- <data i="51"/>
- <data i="52"/>
- <data i="53"/>
- <data i="54"/>
- <data i="55"/>
- <data i="56"/>
- <data i="57"/>
- <data i="58"/>
- <data i="59"/>
- </table>
-
-<!-- END: measurement-data.xml -->
-<!-- BEGIN: content-data.xml -->
-
- <table name="RHQ_ARCHITECTURE">
- <data id="1" name="noarch"/>
- <data id="2" name="i386"/>
- <data id="3" name="i486"/>
- <data id="4" name="i586"/>
- <data id="5" name="i686"/>
- <data id="6" name="alpha"/>
- <data id="7" name="alphaev6"/>
- <data id="8" name="ia64"/>
- <data id="9" name="sparc"/>
- <data id="10" name="sparcv9"/>
- <data id="11" name="sparc64"/>
- <data id="12" name="src"/>
- <data id="13" name="s390"/>
- <data id="14" name="athlon"/>
- <data id="15" name="s390x"/>
- <data id="16" name="ppc"/>
- <data id="17" name="ppc64"/>
- <data id="18" name="pSeries"/>
- <data id="19" name="iSeries"/>
- <data id="20" name="x86_64"/>
- <data id="21" name="ppc64iseries"/>
- <data id="22" name="ppc64pseries"/>
- <data id="23" name="sparc-solaris"/>
- <data id="24" name="sparc.sun4u-solaris"/>
- <data id="25" name="tar"/>
- <data id="26" name="ia32e"/>
- <data id="27" name="amd64"/>
- <data id="28" name="i386-solaris"/>
- <data id="29" name="nosrc"/>
- <data id="30" name="sparc-solaris-patch"/>
- <data id="31" name="i386-solaris-patch"/>
- <data id="32" name="sparc-solaris-patch-cluster"/>
- <data id="33" name="i386-solaris-patch-cluster"/>
- <data id="34" name="noarch-solaris"/>
- <data id="35" name="noarch-solaris-patch"/>
- <data id="36" name="noarch-solaris-patch-cluster"/>
- <data id="37" name="solaris-patch"/>
- <data id="38" name="solaris-patch-cluster"/>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <data id="1" name="family"/>
- </table>
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <data id="1" name="parent"/>
- <data id="2" name="clone"/>
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <data id="1" name="kickstart" description="Linux kickstart distribution"/>
- <data id="2" name="jumpstart" description="solaris jumpstart distribution"/>
- </table>
-
-<!-- END: content-data.xml -->
-<!-- BEGIN: jms-data.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-<!-- the data must match that which is expected in conf/login-config.xml -->
-
-
- <table name="JMS_USERS">
- <data USERID="guest" PASSWD="guest" />
- </table>
-
- <table name="JMS_ROLES">
- <data ROLEID="guest" USERID="guest" />
- </table>
-
-<!-- END: jms-data.xml -->
-<!-- END: rhq-data.xml -->
-<!-- BEGIN: jon-data.xml -->
-
-<!-- This dbsetup config file defines a content source and
- associated repo for the JBoss CP RSS patch feed. -->
-
-
- <!-- ********* metadata (the content source type and its config def) ********* -->
-
- <table name="RHQ_CONFIG_DEF">
- <data ID="101"
- NAME="JBoss CP Patch Feed Content Source"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <data ID="101"
- NAME="url"
- DISPLAY_NAME="Feed URL"
- DESCRIPTION="URL of the feed (e.g. https://access.redhat.com/jbossnetwork/restricted/feed/software.html?prod...)."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="0"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="102"
- NAME="username"
- DISPLAY_NAME="Username"
- DESCRIPTION="Username used to access the feed URL."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="1"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="103"
- NAME="password"
- DISPLAY_NAME="Password"
- DESCRIPTION="Password used to access the feed URL."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="2"
- SIMPLE_TYPE="PASSWORD"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="104"
- NAME="active"
- DISPLAY_NAME="Active"
- DESCRIPTION="Indicates if the feed should be checked for new patches."
- REQUIRED="1"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="3"
- SIMPLE_TYPE="BOOLEAN"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="105"
- NAME="proxyUrl"
- DISPLAY_NAME="Proxy URL"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="4"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="106"
- NAME="proxyPort"
- DISPLAY_NAME="Proxy Port"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="5"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="107"
- NAME="proxyUsername"
- DISPLAY_NAME="Proxy Username"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="6"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- <data ID="108"
- NAME="proxyPassword"
- DISPLAY_NAME="Proxy Password"
- REQUIRED="0"
- READONLY="0"
- SUMMARY="0"
- ACTIVATION_POLICY="IMMEDIATE"
- ORDER_INDEX="7"
- SIMPLE_TYPE="STRING"
- ALLOW_CUSTOM_ENUM_VALUE="0"
- DTYPE="property"
- CONFIG_DEF_ID="101"
- UNITS="0"/>
- </table>
-
- <!-- NOTE: The values of the NAME, PLUGIN_NAME, and API_CLASS columns must match what is
- defined in RHQ/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml. -->
- <!-- default sync chedule: 1st of every month at 12am -->
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <data ID="101"
- NAME="JBossASPatchSource"
- DISPLAY_NAME="JBoss Patch Content Source"
- DESCRIPTION="a content source that retrieves package metadata from an RSS feed; the feed must be in the format used by the JBoss CP"
- PLUGIN_NAME="JBossASPatchContentSourcePlugin"
- DEFAULT_LAZY_LOAD="1"
- DEFAULT_DOWNLOAD_MODE="DATABASE"
- DEFAULT_SYNC_SCHEDULE="0 0 0 1 * ?"
- API_CLASS="org.rhq.enterprise.server.plugins.jboss.software.JBossSoftwareContentSourceAdapter"
- SOURCE_CONFIG_DEF_ID="101"/>
- </table>
-
-
- <!-- the default template -->
- <table name="RHQ_CONFIG">
- <data ID="101"
- VERSION="0"
- CTIME="1270066600000"
- MTIME="1270066600000"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <data ID="101"
- NAME="url"
- CONFIGURATION_ID="101"
- STRING_VALUE=""
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="102"
- NAME="username"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="103"
- NAME="password"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="104"
- NAME="proxyUrl"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="105"
- NAME="proxyPort"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="106"
- NAME="active"
- CONFIGURATION_ID="101"
- STRING_VALUE="true"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="107"
- NAME="proxyUsername"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="108"
- NAME="proxyPassword"
- CONFIGURATION_ID="101"
- OVERRIDE="0"
- DTYPE="property"/>
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <data ID="101"
- NAME="default"
- DESCRIPTION="the default initial values for the configuration of a JBossASPatchSource content source"
- CONFIG_ID="101"
- CONFIG_DEF_ID="101"
- IS_DEFAULT="1"/>
- </table>
-
-
- <!-- ********* data (the content source and its config) ********* -->
-
- <table name="RHQ_CONFIG">
- <data ID="102"
- VERSION="0"
- CTIME="1270066600000"
- MTIME="1270066600000"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <data ID="111"
- NAME="url"
- CONFIGURATION_ID="102"
- STRING_VALUE="https://access.redhat.com/jbossnetwork/restricted/feed/software.html?prod..."
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="112"
- NAME="username"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="113"
- NAME="password"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="114"
- NAME="proxyUrl"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="115"
- NAME="proxyPort"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="116"
- NAME="active"
- CONFIGURATION_ID="102"
- STRING_VALUE="false"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="117"
- NAME="proxyUsername"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- <data ID="118"
- NAME="proxyPassword"
- CONFIGURATION_ID="102"
- OVERRIDE="0"
- DTYPE="property"/>
- </table>
-
- <!-- sync chedule: 1st of every month at 12am -->
- <table name="RHQ_CONTENT_SOURCE">
- <data ID="101"
- NAME="JBoss CP Patch Feed"
- DESCRIPTION="an RSS feed published by the JBoss Customer Portal (CP) website which provides a list of all JBoss product patches available for the subscription of a given CP user; the feed entries for most cumulative patches (CPs) include automated install instructions that can be used by JON to install those CPs to inventoried server Resources (e.g. JBoss EAP servers)"
- LAZY_LOAD="1"
- DOWNLOAD_MODE="DATABASE"
- SYNC_SCHEDULE="0 0 0 1 * ?"
- CREATION_TIME="1270066600000"
- LAST_MODIFIED_TIME="1270066600000"
- CONTENT_SOURCE_TYPE_ID="101"
- CONFIGURATION_ID="102"/>
- </table>
-
- <!-- sync chedule: every Mon at 1am -->
- <table name="RHQ_REPO">
- <data ID="101"
- NAME="JBoss Patches"
- DESCRIPTION="the patches obtained from the JBoss CP patch feed"
- SYNC_SCHEDULE="0 0 1 ? * 1"
- CREATION_TIME="1270066600000"
- LAST_MODIFIED_TIME="1270066600000"
- IS_PRIVATE="0"
- IS_CANDIDATE="0"/>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP">
- <data REPO_ID="101"
- CONTENT_SRC_ID="101"
- CTIME="1270066600000"/>
- </table>
-
-
-<!-- END: jon-data.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml
deleted file mode 100644
index 7e5c38b..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="data.xml">
-<!-- BEGIN: auth-data.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
- <data id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
- </table>
-
-<!-- END: auth-data.xml -->
-<!-- BEGIN: authz-data.xml -->
-
-
- <!-- the overlord user -->
- <table name="RHQ_SUBJECT">
- <data ID="1"
- NAME="admin"
- FIRST_NAME="Super"
- LAST_NAME="User"
- FSYSTEM="TRUE"/>
- </table>
-
- <!-- the initial rhqadmin user -->
- <table name="RHQ_SUBJECT">
- <data ID="2"
- NAME="rhqadmin"
- FIRST_NAME="RHQ"
- LAST_NAME="Administrator"
- EMAIL_ADDRESS="rhqadmin@localhost"
- FSYSTEM="FALSE"/>
- </table>
-
- <!-- Define the system root role which includes our overlord and rhqadmin users -->
- <table name="RHQ_ROLE">
- <data ID="1"
- NAME="Super User Role"
- FSYSTEM="TRUE"
- DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
- <data ID="2"
- NAME="All Resources Role"
- FSYSTEM="FALSE"
- DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
- </table>
-
- <!-- associate the root users with all security permissions -->
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <!-- overlord user -->
- <data SUBJECT_ID="1" ROLE_ID="1"/>
- <!-- rhqadmin user -->
- <data SUBJECT_ID="2" ROLE_ID="1"/>
- </table>
-
- <table name="RHQ_PERMISSION">
- <!-- give super-user-role all permissions
- (explicitly add resource perms, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
- <data ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
- <data ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <data ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
- <!-- resource permissions start here-->
- <data ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="1" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="1" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
-
- <!-- give all-resources-role MANAGE_INVENTORY and MANAGE_BUNDLE permissions
- (explicitly add resource perms as well, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <!-- resource permissions start here-->
- <data ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="2" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="2" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
- </table>
-
-<!-- END: authz-data.xml -->
-<!-- BEGIN: search-data.xml -->
-
-
- <!-- overlord-created, global, default saved searches -->
- <table name="RHQ_SAVED_SEARCH">
- <data ID="1"
- CONTEXT="RESOURCE"
- NAME="Downed Platforms"
- DESCRIPTION="All downed machines across the entire enterprise"
- PATTERN="availability=down category=platform"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- <data ID="2"
- CONTEXT="RESOURCE"
- NAME="Downed Servers"
- DESCRIPTION="All downed servers across the entire enterprise"
- PATTERN="availability=down category=server"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- </table>
-
-<!-- END: search-data.xml -->
-<!-- BEGIN: sysconfig-data.xml -->
-
-
- <!--
- This file contains the seed data for the configuration table.
- All keys mentioned here should be referenced via the RHQConstants class
- -->
- <table name="RHQ_SYSTEM_CONFIG">
- <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="4.2.0"
- DEFAULT_PROPERTY_VALUE="4.2.0" FREAD_ONLY="TRUE"/>
- <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.115"
- DEFAULT_PROPERTY_VALUE="2.115" FREAD_ONLY="TRUE"/>
- <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
- DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
- <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://10.16.88.220:7080/"
- DEFAULT_PROPERTY_VALUE="http://10.16.88.220:7080/" FREAD_ONLY="FALSE"/>
- <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
- DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
- <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
- DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
-
- <!-- default LDAP configuration options -->
- <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
- PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- FREAD_ONLY="FALSE"/>
- <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
- PROPERTY_VALUE="ldap://localhost/"
- DEFAULT_PROPERTY_VALUE="ldap://localhost/"
- FREAD_ONLY="FALSE"/>
- <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
- PROPERTY_VALUE="cn"
- DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
- <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
- PROPERTY_VALUE="o=JBoss,c=US"
- DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
- FREAD_ONLY="FALSE"/>
- <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
- <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
-
- <!-- Does this build support Syslog actions? -->
- <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
- PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
- FREAD_ONLY="FALSE"/>
- <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
- <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- Default data storage options -->
- <!-- Default 14 days -->
- <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
- PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 31 days -->
- <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
- PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 1 year -->
- <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
- PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
- FREAD_ONLY="FALSE"/>
-
- <!-- Baseline options -->
- <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
- <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
- PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
- FREAD_ONLY="FALSE"/>
- <!-- How much data to include in the calulation, default 7 days -->
- <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
- PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
- FREAD_ONLY="FALSE"/>
-
- <!-- ID 31 has been deleted -->
-
- <!-- How often to run database maintainence routines -->
- <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
- PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep RT data around -->
- <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- Whether to reindex the data tables nightly -->
- <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep alerts around -->
- <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep events around (1209600000 millis == 14 days) -->
- <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
- DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
- <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="900000"
- DEFAULT_PROPERTY_VALUE="900000" FREAD_ONLY="FALSE"/>
-
- <!-- Will our server-cloud support agents auto-updating themselves? -->
- <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How old does a trait have to be in order to get purged -->
- <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <!-- How old does availability have to be in order to get purged -->
- <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <data ID="56" PROPERTY_KEY="RESOURCE_GENERIC_PROPERTIES_UPGRADE" PROPERTY_VALUE="false"
- DEFAULT_PROPERTY_VALUE="false" FREAD_ONLY="FALSE"/>
-
- <!-- default drift server plugin settings -->
- <data ID="57" PROPERTY_KEY="ACTIVE_DRIFT_PLUGIN" PROPERTY_VALUE="drift-jpa"
- DEFAULT_PROPERTY_VALUE="drift-jpa" FREAD_ONLY="FALSE"/>
-
- <!-- purge drift files older than 31 days by default -->
- <data ID="58" PROPERTY_KEY="DRIFT_FILE_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- </table>
-
-<!-- END: sysconfig-data.xml -->
-<!-- BEGIN: measurement-data.xml -->
-
- <table name="RHQ_NUMBERS">
- <data i="0"/>
- <data i="1"/>
- <data i="2"/>
- <data i="3"/>
- <data i="4"/>
- <data i="5"/>
- <data i="6"/>
- <data i="7"/>
- <data i="8"/>
- <data i="9"/>
- <data i="10"/>
- <data i="11"/>
- <data i="12"/>
- <data i="13"/>
- <data i="14"/>
- <data i="15"/>
- <data i="16"/>
- <data i="17"/>
- <data i="18"/>
- <data i="19"/>
- <data i="20"/>
- <data i="21"/>
- <data i="22"/>
- <data i="23"/>
- <data i="24"/>
- <data i="25"/>
- <data i="26"/>
- <data i="27"/>
- <data i="28"/>
- <data i="29"/>
- <data i="30"/>
- <data i="31"/>
- <data i="32"/>
- <data i="33"/>
- <data i="34"/>
- <data i="35"/>
- <data i="36"/>
- <data i="37"/>
- <data i="38"/>
- <data i="39"/>
- <data i="40"/>
- <data i="41"/>
- <data i="42"/>
- <data i="43"/>
- <data i="44"/>
- <data i="45"/>
- <data i="46"/>
- <data i="47"/>
- <data i="48"/>
- <data i="49"/>
- <data i="50"/>
- <data i="51"/>
- <data i="52"/>
- <data i="53"/>
- <data i="54"/>
- <data i="55"/>
- <data i="56"/>
- <data i="57"/>
- <data i="58"/>
- <data i="59"/>
- </table>
-
-<!-- END: measurement-data.xml -->
-<!-- BEGIN: content-data.xml -->
-
- <table name="RHQ_ARCHITECTURE">
- <data id="1" name="noarch"/>
- <data id="2" name="i386"/>
- <data id="3" name="i486"/>
- <data id="4" name="i586"/>
- <data id="5" name="i686"/>
- <data id="6" name="alpha"/>
- <data id="7" name="alphaev6"/>
- <data id="8" name="ia64"/>
- <data id="9" name="sparc"/>
- <data id="10" name="sparcv9"/>
- <data id="11" name="sparc64"/>
- <data id="12" name="src"/>
- <data id="13" name="s390"/>
- <data id="14" name="athlon"/>
- <data id="15" name="s390x"/>
- <data id="16" name="ppc"/>
- <data id="17" name="ppc64"/>
- <data id="18" name="pSeries"/>
- <data id="19" name="iSeries"/>
- <data id="20" name="x86_64"/>
- <data id="21" name="ppc64iseries"/>
- <data id="22" name="ppc64pseries"/>
- <data id="23" name="sparc-solaris"/>
- <data id="24" name="sparc.sun4u-solaris"/>
- <data id="25" name="tar"/>
- <data id="26" name="ia32e"/>
- <data id="27" name="amd64"/>
- <data id="28" name="i386-solaris"/>
- <data id="29" name="nosrc"/>
- <data id="30" name="sparc-solaris-patch"/>
- <data id="31" name="i386-solaris-patch"/>
- <data id="32" name="sparc-solaris-patch-cluster"/>
- <data id="33" name="i386-solaris-patch-cluster"/>
- <data id="34" name="noarch-solaris"/>
- <data id="35" name="noarch-solaris-patch"/>
- <data id="36" name="noarch-solaris-patch-cluster"/>
- <data id="37" name="solaris-patch"/>
- <data id="38" name="solaris-patch-cluster"/>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <data id="1" name="family"/>
- </table>
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <data id="1" name="parent"/>
- <data id="2" name="clone"/>
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <data id="1" name="kickstart" description="Linux kickstart distribution"/>
- <data id="2" name="jumpstart" description="solaris jumpstart distribution"/>
- </table>
-
-<!-- END: content-data.xml -->
-<!-- BEGIN: jms-data.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-<!-- the data must match that which is expected in conf/login-config.xml -->
-
-
- <table name="JMS_USERS">
- <data USERID="guest" PASSWD="guest" />
- </table>
-
- <table name="JMS_ROLES">
- <data ROLEID="guest" USERID="guest" />
- </table>
-
-<!-- END: jms-data.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml
deleted file mode 100644
index 26574c4..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="data.xml">
-<!-- BEGIN: auth-data.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
- <data id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
- </table>
-
-<!-- END: auth-data.xml -->
-<!-- BEGIN: authz-data.xml -->
-
-
- <!-- the overlord user -->
- <table name="RHQ_SUBJECT">
- <data ID="1"
- NAME="admin"
- FIRST_NAME="Super"
- LAST_NAME="User"
- FSYSTEM="TRUE"/>
- </table>
-
- <!-- the initial rhqadmin user -->
- <table name="RHQ_SUBJECT">
- <data ID="2"
- NAME="rhqadmin"
- FIRST_NAME="RHQ"
- LAST_NAME="Administrator"
- EMAIL_ADDRESS="rhqadmin@localhost"
- FSYSTEM="FALSE"/>
- </table>
-
- <!-- Define the system root role which includes our overlord and rhqadmin users -->
- <table name="RHQ_ROLE">
- <data ID="1"
- NAME="Super User Role"
- FSYSTEM="TRUE"
- DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
- <data ID="2"
- NAME="All Resources Role"
- FSYSTEM="FALSE"
- DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
- </table>
-
- <!-- associate the root users with all security permissions -->
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <!-- overlord user -->
- <data SUBJECT_ID="1" ROLE_ID="1"/>
- <!-- rhqadmin user -->
- <data SUBJECT_ID="2" ROLE_ID="1"/>
- </table>
-
- <table name="RHQ_PERMISSION">
- <!-- give super-user-role all permissions
- (explicitly add resource perms, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
- <data ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
- <data ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <data ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
- <data ROLE_ID="1" OPERATION="17"/> <!-- Permission.VIEW_USERS -->
- <!-- resource permissions start here-->
- <data ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="1" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="1" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
-
- <!-- give all-resources-role MANAGE_INVENTORY and MANAGE_BUNDLE permissions
- (explicitly add resource perms as well, even though they are implied by MANAGE_INVENTORY) -->
- <data ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
- <data ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
- <data ROLE_ID="2" OPERATION="17"/> <!-- Permission.VIEW_USERS -->
- <!-- resource permissions start here-->
- <data ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
- <data ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
- <data ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
- <data ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
- <data ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
- <data ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
- <data ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
- <data ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
- <data ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
- <data ROLE_ID="2" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
- <data ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
- <data ROLE_ID="2" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
- </table>
-
-<!-- END: authz-data.xml -->
-<!-- BEGIN: search-data.xml -->
-
-
- <!-- overlord-created, global, default saved searches -->
- <table name="RHQ_SAVED_SEARCH">
- <data ID="1"
- CONTEXT="RESOURCE"
- NAME="Downed Platforms"
- DESCRIPTION="All downed machines across the entire enterprise"
- PATTERN="availability=down category=platform"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- <data ID="2"
- CONTEXT="RESOURCE"
- NAME="Downed Servers"
- DESCRIPTION="All downed servers across the entire enterprise"
- PATTERN="availability=down category=server"
- LAST_COMPUTE_TIME="0"
- SUBJECT_ID="1"
- GLOBAL="TRUE" />
- </table>
-
-<!-- END: search-data.xml -->
-<!-- BEGIN: sysconfig-data.xml -->
-
-
- <!--
- This file contains the seed data for the configuration table.
- All keys mentioned here should be referenced via the RHQConstants class
- -->
- <table name="RHQ_SYSTEM_CONFIG">
- <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="4.3.0"
- DEFAULT_PROPERTY_VALUE="4.3.0" FREAD_ONLY="TRUE"/>
- <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.119"
- DEFAULT_PROPERTY_VALUE="2.119" FREAD_ONLY="TRUE"/>
- <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
- DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
- <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://10.16.88.220:7080/"
- DEFAULT_PROPERTY_VALUE="http://10.16.88.220:7080/" FREAD_ONLY="FALSE"/>
- <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
- DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
- <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
- DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
-
- <!-- default LDAP configuration options -->
- <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
- PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
- FREAD_ONLY="FALSE"/>
- <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
- PROPERTY_VALUE="ldap://localhost/"
- DEFAULT_PROPERTY_VALUE="ldap://localhost/"
- FREAD_ONLY="FALSE"/>
- <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
- PROPERTY_VALUE="cn"
- DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
- <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
- PROPERTY_VALUE="o=JBoss,c=US"
- DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
- FREAD_ONLY="FALSE"/>
- <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
- PROPERTY_VALUE=""
- DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
- <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
- <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
- PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
- FREAD_ONLY="FALSE"/>
-
- <!-- Does this build support Syslog actions? -->
- <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
- PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
- FREAD_ONLY="FALSE"/>
- <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
- <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
- PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- Default data storage options -->
- <!-- Default 14 days -->
- <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
- PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 31 days -->
- <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
- PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
- FREAD_ONLY="FALSE"/>
- <!-- Default 1 year -->
- <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
- PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
- FREAD_ONLY="FALSE"/>
-
- <!-- Baseline options -->
- <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
- <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
- PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
- FREAD_ONLY="FALSE"/>
- <!-- How much data to include in the calulation, default 7 days -->
- <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
- PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
- FREAD_ONLY="FALSE"/>
-
- <!-- ID 31 has been deleted -->
-
- <!-- How often to run database maintainence routines -->
- <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
- PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep RT data around -->
- <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- Whether to reindex the data tables nightly -->
- <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep alerts around -->
- <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- <!-- How long to keep events around (1209600000 millis == 14 days) -->
- <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
- DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
-
- <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
- <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="900000"
- DEFAULT_PROPERTY_VALUE="900000" FREAD_ONLY="FALSE"/>
-
- <!-- Will our server-cloud support agents auto-updating themselves? -->
- <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
- DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
-
- <!-- How old does a trait have to be in order to get purged -->
- <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <!-- How old does availability have to be in order to get purged -->
- <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
- DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
-
- <data ID="56" PROPERTY_KEY="RESOURCE_GENERIC_PROPERTIES_UPGRADE" PROPERTY_VALUE="false"
- DEFAULT_PROPERTY_VALUE="false" FREAD_ONLY="FALSE"/>
-
- <!-- default drift server plugin settings -->
- <data ID="57" PROPERTY_KEY="ACTIVE_DRIFT_PLUGIN" PROPERTY_VALUE="drift-jpa"
- DEFAULT_PROPERTY_VALUE="drift-jpa" FREAD_ONLY="FALSE"/>
-
- <!-- purge drift files older than 31 days by default -->
- <data ID="58" PROPERTY_KEY="DRIFT_FILE_PURGE" PROPERTY_VALUE="2678400000"
- DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
-
- </table>
-
-<!-- END: sysconfig-data.xml -->
-<!-- BEGIN: measurement-data.xml -->
-
- <table name="RHQ_NUMBERS">
- <data i="0"/>
- <data i="1"/>
- <data i="2"/>
- <data i="3"/>
- <data i="4"/>
- <data i="5"/>
- <data i="6"/>
- <data i="7"/>
- <data i="8"/>
- <data i="9"/>
- <data i="10"/>
- <data i="11"/>
- <data i="12"/>
- <data i="13"/>
- <data i="14"/>
- <data i="15"/>
- <data i="16"/>
- <data i="17"/>
- <data i="18"/>
- <data i="19"/>
- <data i="20"/>
- <data i="21"/>
- <data i="22"/>
- <data i="23"/>
- <data i="24"/>
- <data i="25"/>
- <data i="26"/>
- <data i="27"/>
- <data i="28"/>
- <data i="29"/>
- <data i="30"/>
- <data i="31"/>
- <data i="32"/>
- <data i="33"/>
- <data i="34"/>
- <data i="35"/>
- <data i="36"/>
- <data i="37"/>
- <data i="38"/>
- <data i="39"/>
- <data i="40"/>
- <data i="41"/>
- <data i="42"/>
- <data i="43"/>
- <data i="44"/>
- <data i="45"/>
- <data i="46"/>
- <data i="47"/>
- <data i="48"/>
- <data i="49"/>
- <data i="50"/>
- <data i="51"/>
- <data i="52"/>
- <data i="53"/>
- <data i="54"/>
- <data i="55"/>
- <data i="56"/>
- <data i="57"/>
- <data i="58"/>
- <data i="59"/>
- </table>
-
-<!-- END: measurement-data.xml -->
-<!-- BEGIN: content-data.xml -->
-
- <table name="RHQ_ARCHITECTURE">
- <data id="1" name="noarch"/>
- <data id="2" name="i386"/>
- <data id="3" name="i486"/>
- <data id="4" name="i586"/>
- <data id="5" name="i686"/>
- <data id="6" name="alpha"/>
- <data id="7" name="alphaev6"/>
- <data id="8" name="ia64"/>
- <data id="9" name="sparc"/>
- <data id="10" name="sparcv9"/>
- <data id="11" name="sparc64"/>
- <data id="12" name="src"/>
- <data id="13" name="s390"/>
- <data id="14" name="athlon"/>
- <data id="15" name="s390x"/>
- <data id="16" name="ppc"/>
- <data id="17" name="ppc64"/>
- <data id="18" name="pSeries"/>
- <data id="19" name="iSeries"/>
- <data id="20" name="x86_64"/>
- <data id="21" name="ppc64iseries"/>
- <data id="22" name="ppc64pseries"/>
- <data id="23" name="sparc-solaris"/>
- <data id="24" name="sparc.sun4u-solaris"/>
- <data id="25" name="tar"/>
- <data id="26" name="ia32e"/>
- <data id="27" name="amd64"/>
- <data id="28" name="i386-solaris"/>
- <data id="29" name="nosrc"/>
- <data id="30" name="sparc-solaris-patch"/>
- <data id="31" name="i386-solaris-patch"/>
- <data id="32" name="sparc-solaris-patch-cluster"/>
- <data id="33" name="i386-solaris-patch-cluster"/>
- <data id="34" name="noarch-solaris"/>
- <data id="35" name="noarch-solaris-patch"/>
- <data id="36" name="noarch-solaris-patch-cluster"/>
- <data id="37" name="solaris-patch"/>
- <data id="38" name="solaris-patch-cluster"/>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <data id="1" name="family"/>
- </table>
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <data id="1" name="parent"/>
- <data id="2" name="clone"/>
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <data id="1" name="kickstart" description="Linux kickstart distribution"/>
- <data id="2" name="jumpstart" description="solaris jumpstart distribution"/>
- </table>
-
-<!-- END: content-data.xml -->
-<!-- BEGIN: jms-data.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-<!-- the data must match that which is expected in conf/login-config.xml -->
-
-
- <table name="JMS_USERS">
- <data USERID="guest" PASSWD="guest" />
- </table>
-
- <table name="JMS_ROLES">
- <data ROLEID="guest" USERID="guest" />
- </table>
-
-<!-- END: jms-data.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.4.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.4.0.xml
deleted file mode 100644
index 8ac0762..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.4.0.xml
+++ /dev/null
@@ -1,2494 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="schema">
-<!-- BEGIN: config-schema.xml -->
-
-
- <!-- Definition or Metadata tables -->
-
- <table name="RHQ_CONFIG_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CONFIG_FORMAT" type="VARCHAR2" required="false" size="32"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_GRP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
- <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="REQUIRED" type="BOOLEAN" required="false"/>
- <column name="READONLY" type="BOOLEAN" required="false"/>
- <column name="SUMMARY" type="BOOLEAN" required="false"/>
- <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
- <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
-
- <!-- only simple properties (not lists and maps) have this -->
- <column name="UNITS" type="SMALLINT" required="false"/>
-
- <!-- only dynamic properties (not simple) have this -->
- <column name="DYNAMIC_TYPE" type="VARCHAR2" size="20" required="false"/>
- <column name="DYNAMIC_KEY" type="VARCHAR2" size="128" required="false"/>
- </table>
-
- <table name="RHQ_CONF_PROP_DEF_ENUM">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_CONSTR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
- <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
- <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
-
- <!-- Content or value tables -->
-
- <table name="RHQ_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="OVERRIDE" type="BOOLEAN" required="false"/>
- <column name="NAME" type="VARCHAR2" required="true" size="255"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
- http://support.microsoft.com/kb/321843 -->
- <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="LIST_INDEX" type="INTEGER"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
- <field ref="CONFIGURATION_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
- <field ref="PARENT_MAP_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
- <field ref="PARENT_LIST_ID"/>
- </index>
- <!-- List entries all have the same name -->
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
- <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
- </table>
-
- <table name="RHQ_RAW_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG(ID)"/>
- <column name="PATH" type="VARCHAR2" required="false" size="512"/>
- <column name="CONTENTS" type="CLOB" required="true"/>
- <column name="SHA256" type="VARCHAR2" size="64" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
-<!-- END: config-schema.xml -->
-<!-- BEGIN: cluster-schema.xml -->
-
- <table name="RHQ_AFFINITY_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_SERVER">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="SECURE_PORT" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
- <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- new agent -->
- <table name="RHQ_AGENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
- <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
- <column name="BACKFILLED" type="BOOLEAN" required="true" />
-
- <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
-
- <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
- <field ref="ADDRESS"/>
- <field ref="PORT"/>
- </index>
-
- <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
- <field ref="AGENTTOKEN"/>
- </index>
- </table>
-
- <table name="RHQ_PARTITION_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="SUBJECT_NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
- <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
- <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_PARTITION_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
- <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
- </table>
-
- <table name="RHQ_FAILOVER_LIST">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
- <column name="CTIME" required="true" type="LONG"/>
- </table>
-
- <table name="RHQ_FAILOVER_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
- <column name="ORDINAL" type = "INTEGER" required="true"/>
- </table>
-
-<!-- END: cluster-schema.xml -->
-<!-- BEGIN: inventory-schema.xml -->
-
-
- <!-- NEW RESOURCE TYPES -->
- <table name="RHQ_RESOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
- <column name="SINGLETON" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="PLUGIN" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="SUBCATEGORY_ID" type="INTEGER"/>
- <!--
- TODO add support to DB setup for tables with circular dependencies and then add back this RI
- <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
- -->
- <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
-
- <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
- <field ref="NAME"/>
- <field ref="PLUGIN"/>
- </index>
- </table>
-
- <!-- NEW RESOURCE SUBCATEGORIES -->
- <table name="RHQ_RESOURCE_SUBCAT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
- <!-- resourceTypeId is not required on child sub categories -->
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <!-- Many To Many mapping for resource type to its parents -->
- <table name="RHQ_RESOURCE_TYPE_PARENTS">
- <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
- <primaryKey>
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="PARENT_RESOURCE_TYPE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PROCESS_SCAN">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
- <column name="NAME" type="VARCHAR2" size="100" required="false"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
- <field ref="QUERY"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PRD_VER">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="VERSION" type="VARCHAR2" size="50" required="true"/>
- <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <table name="RHQ_RESOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="UUID" type="CHAR" size="36" required="true"/>
- <column name="NAME" type="VARCHAR2" size="500"/>
- <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
- <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
- <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
- <column name="CONNECTED" type="BOOLEAN"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="VERSION" type="VARCHAR2" size="50"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="ITIME" type="LONG"/>
- <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="MODIFIED_BY" required="false" type="INTEGER"/>
- <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
-
- <index name="RHQ_RESOURCE_idx_key">
- <field ref="RESOURCE_KEY"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_type">
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_agent">
- <field ref="AGENT_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_parent">
- <field ref="PARENT_RESOURCE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_RESOURCE_ERROR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TIME_OCCURRED" type="LONG" required="true"/>
- <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
- <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
- <column name="DETAIL" type="LONGVARCHAR" required="false"/>
-
- <index name="RHQ_RES_ERROR_IDX_RES_ID">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_GROUP_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="CALC_TIME" type="LONG"/>
- <column name="CALC_INTERVAL" type="LONG"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
- <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_GROUP_DEF_NAME" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
- <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
- <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <!-- Compatible groups only -->
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="MODIFIED_BY" required="false" type="INTEGER"/>
- <!-- TODO: Reorder to allow this references="RHQ_SUBJECT" -->
- <column name="RECURSIVE" type="BOOLEAN"/>
-
- <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
- <column name="GROUP_BY" size="500" type="VARCHAR2"/>
-
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
-
- <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
-
- <!-- These two only set if this is a backing group for a resource cluster -->
- <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <column name="VISIBLE" type="BOOLEAN"/>
-
- <index name="RHQ_RES_GROUP_NAME" unique="false">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Many To Many mapping for groups to implicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Many To Many mapping for groups to explicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CONFIG_GROUP_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
- <table name="RHQ_CONFIG_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
-
- <table name="RHQ_TAGGING">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAMESPACE" type="VARCHAR2" required="false" size="20"/>
- <column name="SEMANTIC" type="VARCHAR2" required="false" size="50"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- </table>
-
- <table name="RHQ_TAGGING_RESOURCE_MAP">
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_RES_GROUP_MAP">
- <column name="RESOURCE_GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_GROUP_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: inventory-schema.xml -->
-<!-- BEGIN: auth-schema.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
-
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
- <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
-
- <!-- ensure that principals are unique -->
- <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
- <field ref="PRINCIPAL"/>
- </index>
-
- </table>
-
-<!-- END: auth-schema.xml -->
-<!-- BEGIN: authz-schema.xml -->
-
-
- <table name="RHQ_ROLE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="FSYSTEM" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_ROLE_NAME_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_ROLE_LDAP_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="LDAP_GROUP_NAME" size="128" required="true" type="VARCHAR2"/>
-
- <index name="RHQ_ROLE_LDAP_GROUP_IDX" unique="true">
- <field ref="ROLE_ID"/>
- <field ref="LDAP_GROUP_NAME"/>
- </index>
- </table>
-
- <table name="RHQ_PERMISSION">
- <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
- <column name="OPERATION" type="INTEGER" required="true"/>
- <constraint name="RHQ_PERMISSION_PK">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="OPERATION"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
- <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
- <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
- <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
-
- <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
- <primaryKey>
- <field ref="SUBJECT_ID"/>
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_LDAP_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <constraint name="RHQ_SUBJECT_ROLE_LDAP_MAP_PK">
- <primaryKey>
- <field ref="SUBJECT_ID" />
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-<!-- END: authz-schema.xml -->
-<!-- BEGIN: search-schema.xml -->
-
-
- <table name="RHQ_SAVED_SEARCH">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONTEXT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500" required="false"/>
- <column name="PATTERN" type="VARCHAR2" size="1000" required="true"/>
-
- <column name="LAST_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="RESULT_COUNT" type="LONG" required="false"/>
-
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="true"/>
- <column name="GLOBAL" type="BOOLEAN" required="true"/>
- </table>
-
-<!-- END: search-schema.xml -->
-<!-- BEGIN: operation-schema.xml -->
-
-
- <table name="RHQ_OPERATION_DEF">
-
- <!-- === required columns === -->
-
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
-
- <!-- === optional columns === -->
-
- <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
-
- <!-- A parameter config definition is only required for operations that have parameters. -->
- <!-- A results config definition is only required for operations that return data. -->
- <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
- <column name="TIMEOUT" type="INTEGER"/>
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
- <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
-
- </table>
-
- <table name="RHQ_OPERATION_HISTORY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="STIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="CTIME"/>
- </index>
-
- </table>
-
- <!--
- This table is really just to support some specific use-cases.
- Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
- and to be able to query a list of all schedules along with their associated resource/group IDs
- possibly sorted by their next fire time.
- Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
- we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
- code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
- -->
- <table name="RHQ_OPERATION_SCHEDULE">
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <!--
- Note that this is the same primary key that Quartz uses for its schedules (RHQ_qrtz_job_details).
- We do not need to add DTYPE to the key, because we ensure the name/group are unique
- across resource/group schedules
- -->
- <constraint name="RHQ_OPERATION_SCHEDULE_KEY">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: operation-schema.xml -->
-<!-- BEGIN: event-schema.xml -->
-
-
- <!-- metadata -->
-
- <table name="RHQ_EVENT_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
-
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_EVENT_DEF_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- instance data -->
-
- <table name="RHQ_EVENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
-
- <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
-
- <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
- <field ref="EVENT_DEF_ID"/>
- <field ref="RESOURCE_ID"/>
- <field ref="LOCATION"/>
- </index>
- </table>
-
- <table name="RHQ_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
-
- <column name="TIMESTAMP" required="true" type="LONG"/>
- <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
- <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
- <index name="RHQ_EVENT_IDX" unique="false">
- <field ref="EVENT_SOURCE_ID"/>
- <field ref="TIMESTAMP"/>
- </index>
- </table>
-
-<!-- END: event-schema.xml -->
-<!-- BEGIN: alert-schema.xml -->
-
-
- <table name="RHQ_ALERT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARENT_ID" type="INTEGER" required="false"/>
- <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
- <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
- <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
- <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
- <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
-
- <column name="REQUIRED" required="true" type="SMALLINT"/>
-
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
- <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
- <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
- <column name="DAMPENING_VALUE" type="INTEGER"/>
- <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
- <column name="DAMPENING_PERIOD" type="INTEGER"/>
- <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
- </table>
-
- <table name="RHQ_ALERT_DAMPEN_EVENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
- <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
-
- <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
- <field ref="EVENT_TYPE"/>
- </index>
- <index name="RHQ_DAMPENING_EVENT_TS_IDX">
- <field ref="EVENT_TIMESTAMP"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_CONDITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
- <!--
- <column name="REQUIRED" required="true" type="BOOLEAN"/>
- -->
- <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
- <column name="NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
- <column name="THRESHOLD" required="false" type="DOUBLE"/>
- <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
- <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="TRIGGER_ID" required="false" type="INTEGER"/>
- </table>
-
- <table name="RHQ_ALERT" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="ACK_TIME" required="false" type="LONG"/>
- <column name="ACK_SUBJECT" required="false" size="100" type="VARCHAR2"/>
- <index name="RHQ_ALERT_IDX_TIME" unique="false">
- <field ref="CTIME"/>
- </index>
- <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
- <field ref="ALERT_DEFINITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIF_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <index name="RHQ_ALERT_IDX_ALERT" unique="false">
- <field ref="ALERT_ID"/>
- </index>
- <column name="SENDER" required="false" size="100" type="VARCHAR2"/>
- <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/>
- <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_ALERT_CONDITION_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
- <column name="VALUE" required="false" size="250" type="VARCHAR2"/>
- <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
- <field ref="CTIME" />
- </index>
- <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
- <field ref="ALERT_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIFICATION" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="SENDER_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="EXTRA_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="SENDER_NAME" required="true" size="100" type="VARCHAR2" />
- </table>
-
-<!-- END: alert-schema.xml -->
-<!-- BEGIN: sysconfig-schema.xml -->
-
-
- <table name="RHQ_SYSTEM_CONFIG">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
- <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
-
- <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
- <field ref="PROPERTY_KEY"/>
- </index>
- </table>
-
-<!-- END: sysconfig-schema.xml -->
-<!-- BEGIN: scheduler-schema.xml -->
-
-
- <table name="RHQ_QRTZ_JOB_DETAILS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
- <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
- <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
- <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="JOB_DATA" required="false" type="BLOB"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_JOB_LISTENERS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="JOB_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
- <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
- <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
- <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
- <column name="JOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
- <field ref="NEXT_FIRE_TIME"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
- <field ref="TRIGGER_STATE"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
- <field ref="TRIGGER_STATE"/>
- <field ref="NEXT_FIRE_TIME"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="REPEAT_COUNT" type="LONG" required="true"/>
- <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
- <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_CRON_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
- <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_BLOB_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="BLOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- <field ref="TRIGGER_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_FIRED_TRIGGERS">
- <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="FIRED_TIME" type="LONG" required="true"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="STATE" type="VARCHAR2" size="16" required="true"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
- <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
- <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
- <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
- <field ref="TRIGGER_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
- <field ref="INSTANCE_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
- <field ref="JOB_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
- <field ref="JOB_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_CALENDARS">
- <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="CALENDAR" type="BLOB" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
- <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_SCHEDULER_STATE">
- <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
- <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
- <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
- </table>
-
- <table name="RHQ_QRTZ_LOCKS">
- <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
- <data LOCK_NAME="TRIGGER_ACCESS"/>
- <data LOCK_NAME="JOB_ACCESS"/>
- <data LOCK_NAME="CALENDAR_ACCESS"/>
- <data LOCK_NAME="STATE_ACCESS"/>
- <data LOCK_NAME="MISFIRE_ACCESS"/>
- </table>
-
-<!-- END: scheduler-schema.xml -->
-<!-- BEGIN: amps-schema.xml -->
-
-
- <table name="RHQ_PLUGIN">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
- <column name="AMPS_VERSION" size="16" type="VARCHAR2" required="false"/>
- <column name="ENABLED" type="BOOLEAN" required="true"/>
- <column name="STATUS" size="16" type="VARCHAR2" required="true"/>
- <column name="HELP" type="CLOB" required="false"/>
- <column name="PATH" size="500" type="VARCHAR2" required="true"/>
- <column name="MD5" size="100" type="VARCHAR2" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DEPLOYMENT" size="8" type="VARCHAR2" required="true"/>
- <column name="PTYPE" size="200" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="JOBS_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT" type="BLOB" required="false"/>
-
- <index name="RHQ_PLUGIN_NAME_DEPLOY_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="DEPLOYMENT"/>
- </index>
- </table>
-
-<!-- END: amps-schema.xml -->
-<!-- BEGIN: measurement-schema.xml -->
-
- <table name="RHQ_MEASUREMENT_DEF">
-
- <!-- === required columns === -->
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
-
- <!-- === optional columns === -->
- <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
- <column name="CATEGORY" type="SMALLINT"/>
- <column name="UNITS" type="SMALLINT"/>
- <column name="NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DISPLAY_TYPE" type="SMALLINT"/>
- <column name="DATA_TYPE" type="SMALLINT"/>
- <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
- <column name="DEFAULT_INTERVAL" type="LONG" />
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
- <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
-
- <column name="VERSION" type="INTEGER"/>
- <!-- for optimistic locking -->
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
- <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- <field ref="RAW_NUMERIC_TYPE"/>
- </index>
- <index name="RHQ_METRIC_DEF_NT_IDX">
- <field ref="NUMERIC_TYPE"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_SCHED">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="ENABLED" type="BOOLEAN" default="false"/>
- <column name="MTIME" type="LONG" />
- <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
- <column name="VERSION" type="INTEGER" />
- <column name="COLL_INTERVAL" type="LONG" />
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
- <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
- <field ref="RESOURCE_ID"/>
- <field ref="DEFINITION"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_BLINE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
- <column name="BL_MIN" type="DOUBLE" required="true"/>
- <column name="BL_MAX" type="DOUBLE" required="true"/>
- <column name="BL_MEAN" type="DOUBLE" required="true"/>
- <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
- <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
- <field ref="BL_COMPUTE_TIME"/>
- </index>
- <index name="RHQ_MEAS_BASELINE_SID_IDX">
- <field ref="SCHEDULE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_TRAIT">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER" />
- <column name="VALUE" type="VARCHAR2" size="4000" />
- <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_KEY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
- <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
- <field ref="SCHEDULE_ID"/>
- <field ref="CALL_DESTINATION"/>
- </index>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_VALUE">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
- <column name="BEGIN_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="true"/>
- <column name="MINIMUM" type="DOUBLE" required="true"/>
- <column name="MAXIMUM" type="DOUBLE" required="true"/>
- <column name="TOTAL" type="DOUBLE" required="true"/>
- <column name="COUNT" type="LONG" required="true"/>
- <index name="RHQ_CT_DA_VA_END_TIM_IDX">
- <field ref="END_TIME"/>
- </index>
- </table>
-
-
- <table name="RHQ_AVAILABILITY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
- <column name="START_TIME" type="LONG" required="true" />
- <column name="END_TIME" type="LONG" required="false" />
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_AVAIL_RESOURCE_START_IDX">
- <field ref="RESOURCE_ID"/>
- <field ref="START_TIME"/>
- </index>
- <!-- only one null row can exist for any resource -->
- <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
- <field ref="RESOURCE_ID"/>
- <field ref="END_TIME" />
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_AVAIL">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_RESOURCE_AVAIL_IDX">
- <field ref="RESOURCE_ID" />
- </index>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB">
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB_TMP">
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_NUMBERS">
- <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
- </table>
-
-
- <table name="RHQ_MEAS_DATA_NUM_R00">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R00_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R01">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R01_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R02">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R02_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R03">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R03_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R04">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R04_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R05">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R05_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R06">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R06_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R07">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R07_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R08">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R08_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R09">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R09_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R10">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R10_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R11">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R11_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R12">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R12_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R13">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R13_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R14">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R14_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: measurement-schema.xml -->
-<!-- BEGIN: content-schema.xml -->
-
-
- <table name="RHQ_ARCHITECTURE">
- <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="50" type="VARCHAR2" required="true"/>
- <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_GROUP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- <column name="REPO_GROUP_TYPE_ID" type="INTEGER" references="RHQ_REPO_GROUP_TYPE" required="true"/>
-
- <index name="RHQ_REPO_GROUP_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="REPO_GROUP_TYPE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
- <!-- we might want this as part of natural key -->
- <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
-
- <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <!-- <field ref="PLUGIN_NAME"/> -->
- </index>
- </table>
-
- <table name="RHQ_CONTENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="CONTENT_SOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_REPO">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
- <column name="IS_CANDIDATE" type="BOOLEAN" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
-
- <index name="RHQ_REPO_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_RELATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RELATED_REPO_ID" type="INTEGER" references="RHQ_REPO" required="true"/>
- <column name="REPO_RELATION_TYPE_ID" type="INTEGER" references="RHQ_REPO_RELATION_TYPE" required="true"/>
- </table>
-
-
-
- <table name="RHQ_PACKAGE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
- <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
- <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
-
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="true"/>
- <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
- <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
-
- <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
-
- <index name="RHQ_PACKAGE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="PACKAGE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PACKAGE_BITS">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BITS" type="LARGEOBJECT" required="false"/>
- </table>
-
- <table name="RHQ_PACKAGE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
- <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
- <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="FILE_SIZE" type="LONG" required="false"/>
- <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
- <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
- <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
- <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
- <column name="METADATA" type="BLOB" required="false"/>
-
- <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
- <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
- <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
-
- <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
- <field ref="PACKAGE_ID"/>
- <field ref="VERSION"/>
- <field ref="ARCHITECTURE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_CONTENT_REQ">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- </table>
-
- <table name="RHQ_INSTALLED_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="INSTALLATION_TIME" type="LONG" required="false"/>
-
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
- </table>
-
- <table name="RHQ_INSTALLED_PKG_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
-
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
- </table>
-
- <table name="RHQ_CONTENT_SRC_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- </table>
-
- <table name="RHQ_REPO_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="PERCENT_COMPLETE" type="LONG" required="false"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- </table>
-
-
- <table name="RHQ_PACKAGE_INST_STEP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
- <column name="STEP_ORDER" type="INTEGER" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
- <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
- <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
- </table>
-
- <table name="RHQ_REPO_RESOURCE_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP"> 1
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_GROUP_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_GROUP_ID" type="INTEGER" required="true" references="RHQ_REPO_GROUP"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_RELATION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_RELATION_ID" type="INTEGER" required="true" references="RHQ_REPO_RELATION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_RELATION_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_RELATION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_REPO_PKG_VERSION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- <index name="RHQ_REPO_PKG_VER_MAP_IDX" unique="false">
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
-
- <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
- <primaryKey>
- <field ref="PACKAGE_VERSION_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PKG_PRD_MAP">
- <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
-
- <constraint name="RHQ_PKG_PRD_KEY">
- <primaryKey>
- <field ref="PKG_ID"/>
- <field ref="PRD_ID"/>
- </primaryKey>
- </constraint>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_TYPE_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION_TYPE"/>
- <column name="LABEL" size="64" type="VARCHAR2" required="true"/>
- <column name="BASE_PATH" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_DISTRIBUTION_IDX" unique="true">
- <field ref="LABEL"/>
- <field ref="BASE_PATH"/>
- </index>
-
- </table>
-
- <table name="RHQ_REPO_DISTRIBUTION">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_DIST_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="DISTRIBUTION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-
- <table name="RHQ_DISTRIBUTION_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="RELATIVE_FILENAME" size="256" type="VARCHAR2" required="true"/>
- <!--<column name="FILE_SIZE" type="NUMBER" required="true"/>-->
- <column name="MD5SUM" size="64" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
- <!--<column name="CTIME" type="LONG" required="true"/>-->
-
- <index name="RHQ_DISTRIBUTION_FILE_IDX" unique="true">
- <field ref="DISTRIBUTION_ID"/>
- <field ref="RELATIVE_FILENAME"/>
- </index>
- </table>
-
-
-
-
- <table name="RHQ_ADVISORY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY" size="64" type="VARCHAR2" required="true"/>
- <column name="ADVISORY_TYPE" size="64" type="VARCHAR2" required="true" />
- <column name="ADVISORY_REL" size="64" type="VARCHAR2" required="false"/>
- <column name="ADVISORY_NAME" size="64" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SYNOPSIS" size="4000" type="VARCHAR2" required="true"/>
- <column name="TOPIC" size="4000" type="VARCHAR2" required="false"/>
- <column name="SOLUTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/>
- <column name="ISSUE_DATE" type="LONG" required="false"/>
- <column name="UPDATE_DATE" type="LONG" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_NAME_UQ" unique="true">
- <field ref="ADVISORY_NAME"/>
- </index>
-
- <index name="RHQ_ADVISORY_UQ" unique="true">
- <field ref="ADVISORY"/>
- </index>
-
- <index name="RHQ_ADVISORY_UDATE_IDX" unique="false">
- <field ref="UPDATE_DATE"/>
- </index>
- </table>
-
- <table name="RHQ_ADVISORY_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_PKG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_CVE">
- <column name="ID" default="sequence-only" initial="101" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="64" type="VARCHAR2" required="true"/>
- </table>
-
- <table name="RHQ_ADVISORY_CVE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="CVE_ID" type="INTEGER" required="true" references="RHQ_CVE"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_CVE_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="CVE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_ADVISORY_BUGLIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="BUG_ID" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_BUG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="BUG_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_ADVISORY">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_ADV_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="ADVISORY_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_TYPE is things like "Cobbler profile" or "file-based bundle" or "puppet recipe" -->
- <table name="RHQ_BUNDLE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
- <table name="RHQ_BUNDLE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/>
- <column name="PACKAGE_TYPE_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_TYPE"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_UNIQUE" unique="true">
- <field ref="BUNDLE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE_VERSION represents an actual piece of content that needs to be installed somewhere -->
- <table name="RHQ_BUNDLE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="VERSION_ORDER" type="INTEGER" required="true"/>
- <column name="ACTION" type="CLOB" required="true"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="NAME"/>
- <field ref="VERSION"/>
- </index>
- </table>
-
- <!-- Many-to-many table that links many repos to a particular bundle version. destination platforms -->
- <!-- would be required to have associations to the specified repos (to access required content -->
- <table name="RHQ_BUNDLE_VERSION_REPO">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <constraint name="RHQ_BUNDLE_VERSION_REPO_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="REPO_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_FILE represents a file that is associated with (possibly bundled inside) a bundle version -->
- <table name="RHQ_BUNDLE_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- </table>
-
- <!-- A logical destination for a bundle deployment. Defines the platforms and directory on those targets. -->
- <table name="RHQ_BUNDLE_DESTINATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="DEPLOY_DIR" size="256" type="VARCHAR2" required="true"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_DESTINATION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="GROUP_ID"/>
- <field ref="DEPLOY_DIR"/>
- </index>
- </table>
-
- <!-- An actual deployment of a bundle version to a destination, with a specific config. Bundle deployments
- can differ only on ctime, which is assumed to be different -->
- <table name="RHQ_BUNDLE_DEPLOYMENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="IS_LIVE" type="BOOLEAN" required="true"/>
- <column name="REPLACED_BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_DEPLOYMENT"/>
- </table>
-
- <!-- Represents a bundle version that is deployed on a platform resource -->
- <table name="RHQ_BUNDLE_RES_DEPLOY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT" />
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE" />
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_BUNDLE_RES_DEPLOY_IDX" unique="true">
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_BUNDLE_RES_DEP_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_RES_DEPLOY_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_RES_DEPLOY" />
- <column name="SUBJECT_NAME" required="false" size="255" type="VARCHAR2"/>
- <column name="AUDIT_TIME" required="true" type="LONG"/>
- <column name="ACTION" required="true" size="128" type="VARCHAR2"/>
- <column name="INFO" required="true" size="512" type="VARCHAR2"/>
- <column name="CATEGORY" required="false" size="32" type="VARCHAR2"/>
- <column name="STATUS" required="true" type="VARCHAR2" size="16"/>
- <column name="MESSAGE" required="false" type="LONGVARCHAR"/>
- <column name="ATTACHMENT" required="false" type="LONGVARCHAR"/>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_MAP">
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_VERSION_MAP">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_VER_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEPLOY_MAP">
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DEP_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEST_MAP">
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DES_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DESTINATION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-<!-- END: content-schema.xml -->
-<!-- BEGIN: resource-request-schema.xml -->
-
-
- <table name="RHQ_CREATE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
- <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
- </table>
-
- <table name="RHQ_DELETE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- </table>
-
-<!-- END: resource-request-schema.xml -->
-<!-- BEGIN: jms-schema.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-
-
- <table name="JMS_MESSAGES">
- <column name="MESSAGEID" required="true" type="INTEGER" />
- <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
- <column name="TXID" required="false" type="INTEGER" />
- <column name="TXOP" required="false" type="CHAR" size="1" />
- <column name="MESSAGEBLOB" required="false" type="BLOB" />
-
- <constraint name="JMS_MESSAGES_PKEY">
- <primaryKey>
- <field ref="MESSAGEID"/>
- <field ref="DESTINATION"/>
- </primaryKey>
- </constraint>
-
- <index name="JMS_MESSAGES_TXOP_TXID">
- <field ref="TXOP"/>
- <field ref="TXID"/>
- </index>
- <index name="JMS_MESSAGES_DESTINATION">
- <field ref="DESTINATION"/>
- </index>
- </table>
-
- <table name="JMS_TRANSACTIONS">
- <column name="TXID" required="true" type="INTEGER" primarykey="true" />
- </table>
-
- <table name="JMS_USERS">
- <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
- <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
- <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
- </table>
-
- <table name="JMS_ROLES">
- <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
- <column name="USERID" required="true" type="VARCHAR2" size="32" />
-
- <constraint name="JMS_ROLES_PKEY">
- <primaryKey>
- <field ref="USERID"/>
- <field ref="ROLEID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="JMS_SUBSCRIPTIONS">
- <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
- <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
- <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
- <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
-
- <constraint name="JMS_SUBSCRIPTIONS_PKEY">
- <primaryKey>
- <field ref="CLIENTID"/>
- <field ref="SUBNAME"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: jms-schema.xml -->
-<!-- BEGIN: obsolete-schema.xml -->
-
-
- <!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in this file! -->
- <!-- NOTE: So, put the table you want dropped first at the bottom, and so on... -->
-
-
- <!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
-
- <table name="RHQ_BUNDLE_CONFIG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <!-- this probably needs a DTYPE discriminator so we know if its a bundle or a specific bundle version -->
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/>
- </table>
-
- <table name="RHQ_CHANNEL" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <index name="RHQ_CHANNEL_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_CHANNEL_RESOURCE_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_CONTENT_SRC_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_PKG_VERSION_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- !!! REMOVED FROM MEASUREMENT-SCHEMA !!!! -->
-
- <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="OCCURRED" type="LONG" required="true"/>
- <column name="DIFF" type="DOUBLE" required="true"/>
-
- <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
- <field ref="SCHEDULE_ID" />
- <field ref="OCCURRED" />
- </index>
- </table>
-
-
- <table name="RHQ_TAG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
- <table name="RHQ_REPO_TAG_MAP" obsolete="true">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAG"/>
-
- <constraint name="RHQ_REPO_TAG_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-<!-- END: obsolete-schema.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml
deleted file mode 100644
index 4c07e1a..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml
+++ /dev/null
@@ -1,2649 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="schema">
-<!-- BEGIN: config-schema.xml -->
-
-
- <!-- Definition or Metadata tables -->
-
- <table name="RHQ_CONFIG_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CONFIG_FORMAT" type="VARCHAR2" required="false" size="32"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_GRP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
- <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="REQUIRED" type="BOOLEAN" required="false"/>
- <column name="READONLY" type="BOOLEAN" required="false"/>
- <column name="SUMMARY" type="BOOLEAN" required="false"/>
- <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
- <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
-
- <!-- only simple properties (not lists and maps) have this -->
- <column name="UNITS" type="SMALLINT" required="false"/>
-
- <!-- only dynamic properties (not simple) have this -->
- <column name="DYNAMIC_TYPE" type="VARCHAR2" size="20" required="false"/>
- <column name="DYNAMIC_KEY" type="VARCHAR2" size="128" required="false"/>
- </table>
-
- <table name="RHQ_CONF_PROP_DEF_ENUM">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PD_OSRC">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="LINK_TO_TARGET" type="BOOLEAN" required="false"/>
- <column name="FILTER" type="VARCHAR2" required="false" size="40"/>
- <column name="EXPRESSION" type="VARCHAR2" required="true" size="400"/>
- <column name="TARGET_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_CONSTR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
- <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
- <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
-
- <!-- Content or value tables -->
-
- <table name="RHQ_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="OVERRIDE" type="BOOLEAN" required="false"/>
- <column name="NAME" type="VARCHAR2" required="true" size="255"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
- http://support.microsoft.com/kb/321843 -->
- <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="LIST_INDEX" type="INTEGER"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
- <field ref="CONFIGURATION_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
- <field ref="PARENT_MAP_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
- <field ref="PARENT_LIST_ID"/>
- </index>
- <!-- List entries all have the same name -->
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
- <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
- </table>
-
- <table name="RHQ_RAW_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG(ID)"/>
- <column name="PATH" type="VARCHAR2" required="false" size="512"/>
- <column name="CONTENTS" type="CLOB" required="true"/>
- <column name="SHA256" type="VARCHAR2" size="64" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
-<!-- END: config-schema.xml -->
-<!-- BEGIN: cluster-schema.xml -->
-
- <table name="RHQ_AFFINITY_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_SERVER">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="SECURE_PORT" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
- <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- new agent -->
- <table name="RHQ_AGENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
- <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
- <column name="BACKFILLED" type="BOOLEAN" required="true" />
-
- <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
-
- <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
- <field ref="ADDRESS"/>
- <field ref="PORT"/>
- </index>
-
- <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
- <field ref="AGENTTOKEN"/>
- </index>
- </table>
-
- <table name="RHQ_PARTITION_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="SUBJECT_NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
- <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
- <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_PARTITION_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
- <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
- </table>
-
- <table name="RHQ_FAILOVER_LIST">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
- <column name="CTIME" required="true" type="LONG"/>
- </table>
-
- <table name="RHQ_FAILOVER_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
- <column name="ORDINAL" type = "INTEGER" required="true"/>
- </table>
-
-<!-- END: cluster-schema.xml -->
-<!-- BEGIN: auth-schema.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
-
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
- <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
-
- <!-- ensure that principals are unique -->
- <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
- <field ref="PRINCIPAL"/>
- </index>
-
- </table>
-
- <table name="RHQ_SUBJECT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
- <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
- <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
- <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-<!-- END: auth-schema.xml -->
-<!-- BEGIN: inventory-schema.xml -->
-
-
- <!-- NEW RESOURCE TYPES -->
- <table name="RHQ_RESOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
- <column name="SINGLETON" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="PLUGIN" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="DELETED" type="BOOLEAN" default="FALSE" required="TRUE"/>
- <column name="SUBCATEGORY_ID" type="INTEGER"/>
- <!--
- TODO add support to DB setup for tables with circular dependencies and then add back this RI
- <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
- -->
- <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="BUNDLE_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG"/>
-
- <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
- <field ref="NAME"/>
- <field ref="PLUGIN"/>
- </index>
- </table>
-
- <!-- NEW RESOURCE SUBCATEGORIES -->
- <table name="RHQ_RESOURCE_SUBCAT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
- <!-- resourceTypeId is not required on child sub categories -->
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <!-- Many To Many mapping for resource type to its parents -->
- <table name="RHQ_RESOURCE_TYPE_PARENTS">
- <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
- <primaryKey>
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="PARENT_RESOURCE_TYPE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PROCESS_SCAN">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
- <column name="NAME" type="VARCHAR2" size="100" required="false"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
- <field ref="QUERY"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PRD_VER">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="VERSION" type="VARCHAR2" size="100" required="true"/>
- <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <table name="RHQ_RESOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="UUID" type="CHAR" size="36" required="true"/>
- <column name="NAME" type="VARCHAR2" size="500"/>
- <!-- ancestry holds the full parental ancestry, used for disambiguation -->
- <column name="ANCESTRY" type="VARCHAR2" required="false" size="4000"/>
- <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
- <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
- <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
- <column name="CONNECTED" type="BOOLEAN"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="VERSION" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="ITIME" type="LONG"/>
- <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
-
- <index name="RHQ_RESOURCE_idx_key">
- <field ref="RESOURCE_KEY"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_type">
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_agent">
- <field ref="AGENT_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_parent">
- <field ref="PARENT_RESOURCE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_RESOURCE_ERROR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TIME_OCCURRED" type="LONG" required="true"/>
- <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
- <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
- <column name="DETAIL" type="LONGVARCHAR" required="false"/>
-
- <index name="RHQ_RES_ERROR_IDX_RES_ID">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_GROUP_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="CALC_TIME" type="LONG"/>
- <column name="CALC_INTERVAL" type="LONG"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
- <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_GROUP_DEF_NAME" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
- <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
- <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <!-- Compatible groups only -->
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
-
- <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
- <column name="GROUP_BY" size="500" type="VARCHAR2"/>
-
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
-
- <!-- This is only set if this is a subject-owned group (like an autogroup) -->
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT"/>
-
- <!-- These two only set if this is a backing group for a resource auto-cluster -->
- <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
- <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- This is only set if this is a backing group for a resource auto-group -->
- <column name="AUTO_GROUP_PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
-
- <column name="VISIBLE" type="BOOLEAN"/>
-
- <index name="RHQ_RES_GROUP_NAME" unique="false">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Many To Many mapping for groups to implicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Many To Many mapping for groups to explicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CONFIG_GROUP_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
- <table name="RHQ_CONFIG_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
-
- <table name="RHQ_TAGGING">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAMESPACE" type="VARCHAR2" required="false" size="20"/>
- <column name="SEMANTIC" type="VARCHAR2" required="false" size="50"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- </table>
-
- <table name="RHQ_TAGGING_RESOURCE_MAP">
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_RES_GROUP_MAP">
- <column name="RESOURCE_GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_GROUP_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: inventory-schema.xml -->
-<!-- BEGIN: authz-schema.xml -->
-
-
- <table name="RHQ_ROLE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="FSYSTEM" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_ROLE_NAME_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_ROLE_LDAP_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="LDAP_GROUP_NAME" size="128" required="true" type="VARCHAR2"/>
-
- <index name="RHQ_ROLE_LDAP_GROUP_IDX" unique="true">
- <field ref="ROLE_ID"/>
- <field ref="LDAP_GROUP_NAME"/>
- </index>
- </table>
-
- <table name="RHQ_PERMISSION">
- <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
- <column name="OPERATION" type="INTEGER" required="true"/>
- <constraint name="RHQ_PERMISSION_PK">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="OPERATION"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
-
- <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
- <primaryKey>
- <field ref="SUBJECT_ID"/>
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_LDAP_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <constraint name="RHQ_SUBJECT_ROLE_LDAP_MAP_PK">
- <primaryKey>
- <field ref="SUBJECT_ID" />
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-<!-- END: authz-schema.xml -->
-<!-- BEGIN: search-schema.xml -->
-
-
- <table name="RHQ_SAVED_SEARCH">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONTEXT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500" required="false"/>
- <column name="PATTERN" type="VARCHAR2" size="1000" required="true"/>
-
- <column name="LAST_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="RESULT_COUNT" type="LONG" required="false"/>
-
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="true"/>
- <column name="GLOBAL" type="BOOLEAN" required="true"/>
- </table>
-
-<!-- END: search-schema.xml -->
-<!-- BEGIN: dashboard-schema.xml -->
-
-
-
- <table name="RHQ_DASHBOARD">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" required="true" references="RHQ_SUBJECT"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="SHARED" type="BOOLEAN" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- </table>
-
-
- <table name="RHQ_DASHBOARD_PORTLET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="PORTLET_KEY" type="VARCHAR2" size="200" required="true"/>
- <column name="COL" type="INTEGER" required="true"/>
- <column name="COL_INDEX" type="INTEGER" required="true"/>
- <column name="HEIGHT" type="INTEGER" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="DASHBOARD_ID" type="INTEGER" required="false" references="RHQ_DASHBOARD"/>
- </table>
-
-<!-- END: dashboard-schema.xml -->
-<!-- BEGIN: operation-schema.xml -->
-
-
- <table name="RHQ_OPERATION_DEF">
-
- <!-- === required columns === -->
-
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
-
- <!-- === optional columns === -->
-
- <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
-
- <!-- A parameter config definition is only required for operations that have parameters. -->
- <!-- A results config definition is only required for operations that return data. -->
- <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
- <column name="TIMEOUT" type="INTEGER"/>
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
- <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
-
- </table>
-
- <table name="RHQ_OPERATION_HISTORY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="STIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="CTIME"/>
- </index>
-
- </table>
-
- <!--
- This table is really just to support some specific use-cases.
- Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
- and to be able to query a list of all schedules along with their associated resource/group IDs
- possibly sorted by their next fire time.
- Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
- we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
- code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
- -->
- <table name="RHQ_OPERATION_SCHEDULE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
-
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <!--
- Note, this is the same as the primary key that Quartz uses for its schedules (RHQ_QRTZ_JOB_DETAILS).
- We do not need to add DTYPE to the key, because we ensure the name/group are unique across resource/group
- schedules
- -->
- <!-- === business key (JOB_NAME + JOB_GROUP) === -->
- <index name="RHQ_OPERATION_SCHEDULE_KEY_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- </table>
-
-<!-- END: operation-schema.xml -->
-<!-- BEGIN: event-schema.xml -->
-
-
- <!-- metadata -->
-
- <table name="RHQ_EVENT_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
-
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_EVENT_DEF_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- instance data -->
-
- <table name="RHQ_EVENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
-
- <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
-
- <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
- <field ref="EVENT_DEF_ID"/>
- <field ref="RESOURCE_ID"/>
- <field ref="LOCATION"/>
- </index>
- </table>
-
- <table name="RHQ_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
-
- <column name="TIMESTAMP" required="true" type="LONG"/>
- <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
- <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
- <index name="RHQ_EVENT_IDX" unique="false">
- <field ref="EVENT_SOURCE_ID"/>
- <field ref="TIMESTAMP"/>
- </index>
- </table>
-
-<!-- END: event-schema.xml -->
-<!-- BEGIN: alert-schema.xml -->
-
-
- <table name="RHQ_ALERT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARENT_ID" type="INTEGER" required="false"/>
- <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
- <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
- <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
- <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
- <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
-
- <column name="REQUIRED" required="true" type="SMALLINT"/>
-
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
- <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
- <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
- <column name="DAMPENING_VALUE" type="INTEGER"/>
- <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
- <column name="DAMPENING_PERIOD" type="INTEGER"/>
- <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
- </table>
-
- <table name="RHQ_ALERT_DAMPEN_EVENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
- <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
-
- <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
- <field ref="EVENT_TYPE"/>
- </index>
- <index name="RHQ_DAMPENING_EVENT_TS_IDX">
- <field ref="EVENT_TIMESTAMP"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_CONDITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
- <!--
- <column name="REQUIRED" required="true" type="BOOLEAN"/>
- -->
- <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
- <column name="NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
- <column name="THRESHOLD" required="false" type="DOUBLE"/>
- <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
- <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="TRIGGER_ID" required="false" type="INTEGER"/>
- </table>
-
- <table name="RHQ_ALERT" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="ACK_TIME" required="false" type="LONG"/>
- <column name="ACK_SUBJECT" required="false" size="100" type="VARCHAR2"/>
- <index name="RHQ_ALERT_IDX_TIME" unique="false">
- <field ref="CTIME"/>
- </index>
- <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
- <field ref="ALERT_DEFINITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIF_LOG" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <index name="RHQ_ALERT_IDX_ALERT" unique="false">
- <field ref="ALERT_ID"/>
- </index>
- <column name="SENDER" required="false" size="100" type="VARCHAR2"/>
- <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/>
- <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_ALERT_CONDITION_LOG" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
- <column name="VALUE" required="true" size="250" type="VARCHAR2"/>
- <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
- <field ref="CTIME" />
- </index>
- <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
- <field ref="ALERT_ID"/>
- </index>
- <index name="RHQ_ALERT_COND_LOG_COND_IDX">
- <field ref="CONDITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIFICATION" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="SENDER_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="EXTRA_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="SENDER_NAME" required="true" size="100" type="VARCHAR2" />
- </table>
-
-<!-- END: alert-schema.xml -->
-<!-- BEGIN: sysconfig-schema.xml -->
-
-
- <table name="RHQ_SYSTEM_CONFIG">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
- <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
-
- <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
- <field ref="PROPERTY_KEY"/>
- </index>
- </table>
-
-<!-- END: sysconfig-schema.xml -->
-<!-- BEGIN: scheduler-schema.xml -->
-
-
- <table name="RHQ_QRTZ_JOB_DETAILS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
- <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
- <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
- <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="JOB_DATA" required="false" type="BLOB"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_JOB_LISTENERS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="JOB_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
- <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
- <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
- <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
- <column name="JOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
- <field ref="NEXT_FIRE_TIME"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
- <field ref="TRIGGER_STATE"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
- <field ref="TRIGGER_STATE"/>
- <field ref="NEXT_FIRE_TIME"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="REPEAT_COUNT" type="LONG" required="true"/>
- <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
- <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_CRON_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
- <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_BLOB_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="BLOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- <field ref="TRIGGER_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_FIRED_TRIGGERS">
- <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="FIRED_TIME" type="LONG" required="true"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="STATE" type="VARCHAR2" size="16" required="true"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
- <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
- <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
- <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
- <field ref="TRIGGER_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
- <field ref="INSTANCE_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
- <field ref="JOB_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
- <field ref="JOB_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_CALENDARS">
- <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="CALENDAR" type="BLOB" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
- <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_SCHEDULER_STATE">
- <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
- <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
- <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
- </table>
-
- <table name="RHQ_QRTZ_LOCKS">
- <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
- <data LOCK_NAME="TRIGGER_ACCESS"/>
- <data LOCK_NAME="JOB_ACCESS"/>
- <data LOCK_NAME="CALENDAR_ACCESS"/>
- <data LOCK_NAME="STATE_ACCESS"/>
- <data LOCK_NAME="MISFIRE_ACCESS"/>
- </table>
-
-<!-- END: scheduler-schema.xml -->
-<!-- BEGIN: amps-schema.xml -->
-
-
- <table name="RHQ_PLUGIN">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
- <column name="AMPS_VERSION" size="16" type="VARCHAR2" required="false"/>
- <column name="ENABLED" type="BOOLEAN" required="true"/>
- <column name="STATUS" size="16" type="VARCHAR2" required="true"/>
- <column name="HELP" type="CLOB" required="false"/>
- <column name="PATH" size="500" type="VARCHAR2" required="true"/>
- <column name="MD5" size="100" type="VARCHAR2" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DEPLOYMENT" size="8" type="VARCHAR2" required="true"/>
- <column name="PTYPE" size="200" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="JOBS_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT" type="BLOB" required="false"/>
-
- <index name="RHQ_PLUGIN_NAME_DEPLOY_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="DEPLOYMENT"/>
- </index>
- </table>
-
-<!-- END: amps-schema.xml -->
-<!-- BEGIN: measurement-schema.xml -->
-
- <table name="RHQ_MEASUREMENT_DEF">
-
- <!-- === required columns === -->
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
-
- <!-- === optional columns === -->
- <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
- <column name="CATEGORY" type="SMALLINT"/>
- <column name="UNITS" type="SMALLINT"/>
- <column name="NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DISPLAY_TYPE" type="SMALLINT"/>
- <column name="DATA_TYPE" type="SMALLINT"/>
- <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
- <column name="DEFAULT_INTERVAL" type="LONG" />
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
- <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
-
- <column name="VERSION" type="INTEGER"/>
- <!-- for optimistic locking -->
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
- <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- <field ref="RAW_NUMERIC_TYPE"/>
- </index>
- <index name="RHQ_METRIC_DEF_NT_IDX">
- <field ref="NUMERIC_TYPE"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_SCHED">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="ENABLED" type="BOOLEAN" default="false"/>
- <column name="MTIME" type="LONG" />
- <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
- <column name="VERSION" type="INTEGER" />
- <column name="COLL_INTERVAL" type="LONG" />
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
- <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
- <field ref="RESOURCE_ID"/>
- <field ref="DEFINITION"/>
- </index>
- <index name="RHQ_MEAS_SCHED_RESID_IDX">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_BLINE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
- <column name="BL_MIN" type="DOUBLE" required="true"/>
- <column name="BL_MAX" type="DOUBLE" required="true"/>
- <column name="BL_MEAN" type="DOUBLE" required="true"/>
- <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
- <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
- <field ref="BL_COMPUTE_TIME"/>
- </index>
- <index name="RHQ_MEAS_BASELINE_SID_IDX">
- <field ref="SCHEDULE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true"
- tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true"
- tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true"
- tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1D_TIME_IDX">
- <field ref="TIME_STAMP" />
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_TRAIT">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER" />
- <column name="VALUE" type="VARCHAR2" size="4000" />
- <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_KEY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
- <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
- <field ref="SCHEDULE_ID"/>
- <field ref="CALL_DESTINATION"/>
- </index>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_VALUE">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
- <column name="BEGIN_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="true"/>
- <column name="MINIMUM" type="DOUBLE" required="true"/>
- <column name="MAXIMUM" type="DOUBLE" required="true"/>
- <column name="TOTAL" type="DOUBLE" required="true"/>
- <column name="COUNT" type="LONG" required="true"/>
- <index name="RHQ_CT_DA_VA_END_TIM_IDX">
- <field ref="END_TIME"/>
- </index>
- </table>
-
-
- <table name="RHQ_AVAILABILITY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
- <column name="START_TIME" type="LONG" required="true" />
- <column name="END_TIME" type="LONG" required="false" />
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_AVAIL_RESOURCE_START_IDX">
- <field ref="RESOURCE_ID"/>
- <field ref="START_TIME"/>
- </index>
- <!-- only one null row can exist for any resource -->
- <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
- <field ref="RESOURCE_ID"/>
- <field ref="END_TIME" />
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_AVAIL">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_RESOURCE_AVAIL_IDX">
- <field ref="RESOURCE_ID" />
- </index>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB">
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB_TMP">
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_NUMBERS">
- <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
- </table>
-
-
- <table name="RHQ_MEAS_DATA_NUM_R00">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R00_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R01">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R01_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R02">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R02_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R03">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R03_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R04">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R04_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R05">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R05_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R06">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R06_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R07">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R07_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R08">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R08_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R09">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R09_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R10">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R10_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R11">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R11_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R12">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R12_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R13">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R13_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R14">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R14_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: measurement-schema.xml -->
-<!-- BEGIN: content-schema.xml -->
-
-
- <table name="RHQ_ARCHITECTURE">
- <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="50" type="VARCHAR2" required="true"/>
- <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_GROUP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- <column name="REPO_GROUP_TYPE_ID" type="INTEGER" references="RHQ_REPO_GROUP_TYPE" required="true"/>
-
- <index name="RHQ_REPO_GROUP_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="REPO_GROUP_TYPE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
- <!-- we might want this as part of natural key -->
- <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
-
- <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <!-- <field ref="PLUGIN_NAME"/> -->
- </index>
- </table>
-
- <table name="RHQ_CONTENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="CONTENT_SOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_REPO">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
- <column name="IS_CANDIDATE" type="BOOLEAN" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="OWNER_ID" type="INTEGER" required="false" references="RHQ_SUBJECT" />
- <column name="IS_PRIVATE" type="BOOLEAN" required="true" />
-
- <index name="RHQ_REPO_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_RELATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RELATED_REPO_ID" type="INTEGER" references="RHQ_REPO" required="true"/>
- <column name="REPO_RELATION_TYPE_ID" type="INTEGER" references="RHQ_REPO_RELATION_TYPE" required="true"/>
- </table>
-
-
-
- <table name="RHQ_PACKAGE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
- <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
- <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
-
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
- <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
-
- <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
-
- <index name="RHQ_PACKAGE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="PACKAGE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PACKAGE_BITS">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BITS" type="LARGEOBJECT" required="false"/>
- </table>
-
- <table name="RHQ_PACKAGE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
- <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
- <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="FILE_SIZE" type="LONG" required="false"/>
- <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
- <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
- <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
- <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
- <column name="METADATA" type="BLOB" required="false"/>
-
- <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
- <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
- <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
-
- <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
- <field ref="PACKAGE_ID"/>
- <field ref="VERSION"/>
- <field ref="ARCHITECTURE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_CONTENT_REQ">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- </table>
-
- <table name="RHQ_INSTALLED_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="INSTALLATION_TIME" type="LONG" required="false"/>
-
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
- </table>
-
- <table name="RHQ_INSTALLED_PKG_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
-
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
- </table>
-
- <table name="RHQ_CONTENT_SRC_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- </table>
-
- <table name="RHQ_REPO_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="PERCENT_COMPLETE" type="LONG" required="false"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- </table>
-
-
- <table name="RHQ_PACKAGE_INST_STEP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
- <column name="STEP_ORDER" type="INTEGER" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
- <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
- <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
- </table>
-
- <table name="RHQ_REPO_RESOURCE_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP"> 1
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_GROUP_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_GROUP_ID" type="INTEGER" required="true" references="RHQ_REPO_GROUP"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_RELATION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_RELATION_ID" type="INTEGER" required="true" references="RHQ_REPO_RELATION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_RELATION_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_RELATION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_REPO_PKG_VERSION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- <index name="RHQ_REPO_PKG_VER_MAP_IDX" unique="false">
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
-
- <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
- <primaryKey>
- <field ref="PACKAGE_VERSION_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PKG_PRD_MAP">
- <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
-
- <constraint name="RHQ_PKG_PRD_KEY">
- <primaryKey>
- <field ref="PKG_ID"/>
- <field ref="PRD_ID"/>
- </primaryKey>
- </constraint>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_TYPE_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION_TYPE"/>
- <column name="LABEL" size="64" type="VARCHAR2" required="true"/>
- <column name="BASE_PATH" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_DISTRIBUTION_IDX" unique="true">
- <field ref="LABEL"/>
- <field ref="BASE_PATH"/>
- </index>
-
- </table>
-
- <table name="RHQ_REPO_DISTRIBUTION">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_DIST_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="DISTRIBUTION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-
- <table name="RHQ_DISTRIBUTION_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="RELATIVE_FILENAME" size="256" type="VARCHAR2" required="true"/>
- <!--<column name="FILE_SIZE" type="NUMBER" required="true"/>-->
- <column name="MD5SUM" size="64" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
- <!--<column name="CTIME" type="LONG" required="true"/>-->
-
- <index name="RHQ_DISTRIBUTION_FILE_IDX" unique="true">
- <field ref="DISTRIBUTION_ID"/>
- <field ref="RELATIVE_FILENAME"/>
- </index>
- </table>
-
-
-
-
- <table name="RHQ_ADVISORY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY" size="64" type="VARCHAR2" required="true"/>
- <column name="ADVISORY_TYPE" size="64" type="VARCHAR2" required="true" />
- <column name="ADVISORY_REL" size="64" type="VARCHAR2" required="false"/>
- <column name="ADVISORY_NAME" size="64" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SYNOPSIS" size="4000" type="VARCHAR2" required="true"/>
- <column name="TOPIC" size="4000" type="VARCHAR2" required="false"/>
- <column name="SOLUTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/>
- <column name="ISSUE_DATE" type="LONG" required="false"/>
- <column name="UPDATE_DATE" type="LONG" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_NAME_UQ" unique="true">
- <field ref="ADVISORY_NAME"/>
- </index>
-
- <index name="RHQ_ADVISORY_UQ" unique="true">
- <field ref="ADVISORY"/>
- </index>
-
- <index name="RHQ_ADVISORY_UDATE_IDX" unique="false">
- <field ref="UPDATE_DATE"/>
- </index>
- </table>
-
- <table name="RHQ_ADVISORY_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_PKG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_CVE">
- <column name="ID" default="sequence-only" initial="101" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="64" type="VARCHAR2" required="true"/>
- </table>
-
- <table name="RHQ_ADVISORY_CVE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="CVE_ID" type="INTEGER" required="true" references="RHQ_CVE"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_CVE_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="CVE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_ADVISORY_BUGLIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="BUG_ID" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_BUG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="BUG_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_ADVISORY">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_ADV_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="ADVISORY_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_TYPE is things like "Cobbler profile" or "file-based bundle" or "puppet recipe" -->
- <table name="RHQ_BUNDLE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
- <table name="RHQ_BUNDLE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/>
- <column name="PACKAGE_TYPE_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_TYPE"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_UNIQUE" unique="true">
- <field ref="BUNDLE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE_VERSION represents an actual piece of content that needs to be installed somewhere -->
- <table name="RHQ_BUNDLE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="VERSION_ORDER" type="INTEGER" required="true"/>
- <column name="ACTION" type="CLOB" required="true"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="NAME"/>
- <field ref="VERSION"/>
- </index>
- </table>
-
- <!-- Many-to-many table that links many repos to a particular bundle version. destination platforms -->
- <!-- would be required to have associations to the specified repos (to access required content -->
- <table name="RHQ_BUNDLE_VERSION_REPO">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <constraint name="RHQ_BUNDLE_VERSION_REPO_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="REPO_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_FILE represents a file that is associated with (possibly bundled inside) a bundle version -->
- <table name="RHQ_BUNDLE_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- </table>
-
- <!-- A logical destination for a bundle deployment. Defines the platforms and directory on those targets. -->
- <table name="RHQ_BUNDLE_DESTINATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="DEPLOY_DIR" size="256" type="VARCHAR2" required="true"/>
- <column name="DEST_BASE_DIR_NAME" size="200" type="VARCHAR2" required="true"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_DESTINATION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="GROUP_ID"/>
- <field ref="DEPLOY_DIR"/>
- </index>
- </table>
-
- <!-- An actual deployment of a bundle version to a destination, with a specific config. Bundle deployments
- can differ only on ctime, which is assumed to be different -->
- <table name="RHQ_BUNDLE_DEPLOYMENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="IS_LIVE" type="BOOLEAN" required="true"/>
- <column name="REPLACED_BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_DEPLOYMENT"/>
- </table>
-
- <!-- Represents a bundle version that is deployed on a platform resource -->
- <table name="RHQ_BUNDLE_RES_DEPLOY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT" />
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE" />
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_BUNDLE_RES_DEPLOY_IDX" unique="true">
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_BUNDLE_RES_DEP_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_RES_DEPLOY_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_RES_DEPLOY" />
- <column name="SUBJECT_NAME" required="false" size="255" type="VARCHAR2"/>
- <column name="AUDIT_TIME" required="true" type="LONG"/>
- <column name="ACTION" required="true" size="128" type="VARCHAR2"/>
- <column name="INFO" required="true" size="512" type="VARCHAR2"/>
- <column name="CATEGORY" required="false" size="32" type="VARCHAR2"/>
- <column name="STATUS" required="true" type="VARCHAR2" size="16"/>
- <column name="MESSAGE" required="false" type="LONGVARCHAR"/>
- <column name="ATTACHMENT" required="false" type="LONGVARCHAR"/>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_MAP">
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_VERSION_MAP">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_VER_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEPLOY_MAP">
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DEP_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEST_MAP">
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DES_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DESTINATION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Drift Management Tables -->
- <table name="RHQ_DRIFT_DEF_TEMPLATE">
- <column name="ID" default="sequence-only" initial="1001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="NAME" type="VARCHAR2" size="128" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <!-- true if defined by user, false if provided by plugin -->
- <column name="IS_USER_DEFINED" type="BOOLEAN" required="true"/>
- <!--
- Change sets are managed by the drift server plugins; therefore, we cannot maintain
- a FK constraint on the change set id. And the type cannot be integer because
- other back ends like MongoDB use other types that are basically variants of a
- UUID
-
- jsanda
- -->
- <column name="DRIFT_CHANGE_SET_ID" type="VARCHAR2" size="64" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_DRIFT_DEF_TEMPLATE_UNIQUE" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Content of a file being managed for drift. Used for diff and/or remediation -->
- <table name="RHQ_DRIFT_FILE">
- <column name="HASH_ID" type="VARCHAR2" size="64" primarykey="true" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="DATA" type="LARGEOBJECT" required="false"/>
- <column name="DATA_SIZE" type="LONG" required="false"/>
- <column name="STATUS" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single drift definition defining file tracking
- Note: A resource or group (todo: group, other?) can have zero or more drift configurations.
- Note: The name, interval and is_enabled values are also stored withing the referenced config.
- This allows us to use the config editor to manipulate all fields.
- Note: Name is read-only
- Note: Interval unit is millis
- -->
- <table name="RHQ_DRIFT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEF_TEMPLATE_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEF_TEMPLATE"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="NAME" type="VARCHAR2" size="512" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <column name="INTERVAL" type="LONG" required="true"/>
- <column name="IS_ENABLED" type="BOOLEAN" required="true"/>
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- <column name="IS_PINNED" type="BOOLEAN" required="true"/>
- <column name="IS_ATTACHED" type="BOOLEAN" required="true"/>
- <column name="COMPLIANCE_STATUS" type="INTEGER" required="true"/>
- </table>
-
- <!-- A set of drift records (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- </table>
-
- <!-- A drift change-set report for a resource (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT_CHANGE_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="CTIME" type="LONG" required="true"/>
- <!-- Version 0 is initial change-set -->
- <column name="VERSION" type="INTEGER" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEFINITION"/>
- <!-- the drift handling mode at changeset creation time -->
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single occurence of drift for a resource (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/>
- <!-- the file path not including the base directory -->
- <column name="PATH" type="VARCHAR2" size="1024" required="true"/>
- <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search.
- this field can be considered transient for serialization purposes -->
- <column name="PATH_DIRECTORY" type="VARCHAR2" size="1024" required="true"/>
- <column name="OLD_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- <column name="NEW_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- </table>
-
-
-<!-- END: content-schema.xml -->
-<!-- BEGIN: resource-request-schema.xml -->
-
-
- <table name="RHQ_CREATE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
- <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
- </table>
-
- <table name="RHQ_DELETE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- </table>
-
-<!-- END: resource-request-schema.xml -->
-<!-- BEGIN: jms-schema.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-
-
- <table name="JMS_MESSAGES">
- <column name="MESSAGEID" required="true" type="INTEGER" />
- <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
- <column name="TXID" required="false" type="INTEGER" />
- <column name="TXOP" required="false" type="CHAR" size="1" />
- <column name="MESSAGEBLOB" required="false" type="BLOB" />
-
- <constraint name="JMS_MESSAGES_PKEY">
- <primaryKey>
- <field ref="MESSAGEID"/>
- <field ref="DESTINATION"/>
- </primaryKey>
- </constraint>
-
- <index name="JMS_MESSAGES_TXOP_TXID">
- <field ref="TXOP"/>
- <field ref="TXID"/>
- </index>
- <index name="JMS_MESSAGES_DESTINATION">
- <field ref="DESTINATION"/>
- </index>
- </table>
-
- <table name="JMS_TRANSACTIONS">
- <column name="TXID" required="true" type="INTEGER" primarykey="true" />
- </table>
-
- <table name="JMS_USERS">
- <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
- <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
- <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
- </table>
-
- <table name="JMS_ROLES">
- <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
- <column name="USERID" required="true" type="VARCHAR2" size="32" />
-
- <constraint name="JMS_ROLES_PKEY">
- <primaryKey>
- <field ref="USERID"/>
- <field ref="ROLEID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="JMS_SUBSCRIPTIONS">
- <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
- <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
- <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
- <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
-
- <constraint name="JMS_SUBSCRIPTIONS_PKEY">
- <primaryKey>
- <field ref="CLIENTID"/>
- <field ref="SUBNAME"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: jms-schema.xml -->
-<!-- BEGIN: obsolete-schema.xml -->
-
-
- <!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in this file! -->
- <!-- NOTE: So, put the table you want dropped first at the bottom, and so on... -->
-
-
- <!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
-
- <table name="RHQ_DRIFT_TEMPLATE_MAP">
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIG_TEMPLATE_ID" type="INTEGER" required="true" references="RHQ_CONFIG_TEMPLATE"/>
- </table>
-
- <table name="RHQ_BUNDLE_CONFIG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <!-- this probably needs a DTYPE discriminator so we know if its a bundle or a specific bundle version -->
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/>
- </table>
-
- <table name="RHQ_CHANNEL" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <index name="RHQ_CHANNEL_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_CHANNEL_RESOURCE_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_CONTENT_SRC_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_PKG_VERSION_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- !!! REMOVED FROM MEASUREMENT-SCHEMA !!!! -->
-
- <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="OCCURRED" type="LONG" required="true"/>
- <column name="DIFF" type="DOUBLE" required="true"/>
-
- <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
- <field ref="SCHEDULE_ID" />
- <field ref="OCCURRED" />
- </index>
- </table>
-
-
- <table name="RHQ_TAG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
- <table name="RHQ_REPO_TAG_MAP" obsolete="true">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAG"/>
-
- <constraint name="RHQ_REPO_TAG_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-<!-- END: obsolete-schema.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml
deleted file mode 100644
index 425a806..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml
+++ /dev/null
@@ -1,2642 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="schema">
-<!-- BEGIN: config-schema.xml -->
-
-
- <!-- Definition or Metadata tables -->
-
- <table name="RHQ_CONFIG_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CONFIG_FORMAT" type="VARCHAR2" required="false" size="32"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_GRP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
- <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="REQUIRED" type="BOOLEAN" required="false"/>
- <column name="READONLY" type="BOOLEAN" required="false"/>
- <column name="SUMMARY" type="BOOLEAN" required="false"/>
- <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
- <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
-
- <!-- only simple properties (not lists and maps) have this -->
- <column name="UNITS" type="SMALLINT" required="false"/>
-
- <!-- only dynamic properties (not simple) have this -->
- <column name="DYNAMIC_TYPE" type="VARCHAR2" size="20" required="false"/>
- <column name="DYNAMIC_KEY" type="VARCHAR2" size="128" required="false"/>
- </table>
-
- <table name="RHQ_CONF_PROP_DEF_ENUM">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PD_OSRC">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="LINK_TO_TARGET" type="BOOLEAN" required="false"/>
- <column name="FILTER" type="VARCHAR2" required="false" size="40"/>
- <column name="EXPRESSION" type="VARCHAR2" required="true" size="400"/>
- <column name="TARGET_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_CONSTR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
- <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
- <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
-
- <!-- Content or value tables -->
-
- <table name="RHQ_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="OVERRIDE" type="BOOLEAN" required="false"/>
- <column name="NAME" type="VARCHAR2" required="true" size="255"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
- http://support.microsoft.com/kb/321843 -->
- <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="LIST_INDEX" type="INTEGER"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
- <field ref="CONFIGURATION_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
- <field ref="PARENT_MAP_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
- <field ref="PARENT_LIST_ID"/>
- </index>
- <!-- List entries all have the same name -->
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
- <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
- </table>
-
- <table name="RHQ_RAW_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG(ID)"/>
- <column name="PATH" type="VARCHAR2" required="false" size="512"/>
- <column name="CONTENTS" type="CLOB" required="true"/>
- <column name="SHA256" type="VARCHAR2" size="64" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
-<!-- END: config-schema.xml -->
-<!-- BEGIN: cluster-schema.xml -->
-
- <table name="RHQ_AFFINITY_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_SERVER">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="SECURE_PORT" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
- <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- new agent -->
- <table name="RHQ_AGENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
- <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
- <column name="BACKFILLED" type="BOOLEAN" required="true" />
-
- <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
-
- <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
- <field ref="ADDRESS"/>
- <field ref="PORT"/>
- </index>
-
- <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
- <field ref="AGENTTOKEN"/>
- </index>
- </table>
-
- <table name="RHQ_PARTITION_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="SUBJECT_NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
- <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
- <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_PARTITION_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
- <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
- </table>
-
- <table name="RHQ_FAILOVER_LIST">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
- <column name="CTIME" required="true" type="LONG"/>
- </table>
-
- <table name="RHQ_FAILOVER_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
- <column name="ORDINAL" type = "INTEGER" required="true"/>
- </table>
-
-<!-- END: cluster-schema.xml -->
-<!-- BEGIN: auth-schema.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
-
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
- <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
-
- <!-- ensure that principals are unique -->
- <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
- <field ref="PRINCIPAL"/>
- </index>
-
- </table>
-
- <table name="RHQ_SUBJECT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
- <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
- <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
- <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-<!-- END: auth-schema.xml -->
-<!-- BEGIN: inventory-schema.xml -->
-
-
- <!-- NEW RESOURCE TYPES -->
- <table name="RHQ_RESOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
- <column name="SINGLETON" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="PLUGIN" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="DELETED" type="BOOLEAN" default="FALSE" required="TRUE"/>
- <column name="SUBCATEGORY_ID" type="INTEGER"/>
- <!--
- TODO add support to DB setup for tables with circular dependencies and then add back this RI
- <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
- -->
- <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="BUNDLE_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG"/>
-
- <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
- <field ref="NAME"/>
- <field ref="PLUGIN"/>
- </index>
- </table>
-
- <!-- NEW RESOURCE SUBCATEGORIES -->
- <table name="RHQ_RESOURCE_SUBCAT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
- <!-- resourceTypeId is not required on child sub categories -->
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <!-- Many To Many mapping for resource type to its parents -->
- <table name="RHQ_RESOURCE_TYPE_PARENTS">
- <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
- <primaryKey>
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="PARENT_RESOURCE_TYPE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PROCESS_SCAN">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
- <column name="NAME" type="VARCHAR2" size="100" required="false"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
- <field ref="QUERY"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PRD_VER">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="VERSION" type="VARCHAR2" size="50" required="true"/>
- <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <table name="RHQ_RESOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="UUID" type="CHAR" size="36" required="true"/>
- <column name="NAME" type="VARCHAR2" size="500"/>
- <!-- ancestry holds the full parental ancestry, used for disambiguation -->
- <column name="ANCESTRY" type="VARCHAR2" required="false" size="4000"/>
- <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
- <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
- <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
- <column name="CONNECTED" type="BOOLEAN"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="VERSION" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="ITIME" type="LONG"/>
- <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
-
- <index name="RHQ_RESOURCE_idx_key">
- <field ref="RESOURCE_KEY"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_type">
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_agent">
- <field ref="AGENT_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_parent">
- <field ref="PARENT_RESOURCE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_RESOURCE_ERROR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TIME_OCCURRED" type="LONG" required="true"/>
- <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
- <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
- <column name="DETAIL" type="LONGVARCHAR" required="false"/>
-
- <index name="RHQ_RES_ERROR_IDX_RES_ID">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_GROUP_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="CALC_TIME" type="LONG"/>
- <column name="CALC_INTERVAL" type="LONG"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
- <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_GROUP_DEF_NAME" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
- <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
- <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <!-- Compatible groups only -->
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
-
- <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
- <column name="GROUP_BY" size="500" type="VARCHAR2"/>
-
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
-
- <!-- This is only set if this is a subject-owned group (like an autogroup) -->
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT"/>
-
- <!-- These two only set if this is a backing group for a resource auto-cluster -->
- <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
- <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- This is only set if this is a backing group for a resource auto-group -->
- <column name="AUTO_GROUP_PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
-
- <column name="VISIBLE" type="BOOLEAN"/>
-
- <index name="RHQ_RES_GROUP_NAME" unique="false">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Many To Many mapping for groups to implicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Many To Many mapping for groups to explicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CONFIG_GROUP_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
- <table name="RHQ_CONFIG_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
-
- <table name="RHQ_TAGGING">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAMESPACE" type="VARCHAR2" required="false" size="20"/>
- <column name="SEMANTIC" type="VARCHAR2" required="false" size="50"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- </table>
-
- <table name="RHQ_TAGGING_RESOURCE_MAP">
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_RES_GROUP_MAP">
- <column name="RESOURCE_GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_GROUP_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: inventory-schema.xml -->
-<!-- BEGIN: authz-schema.xml -->
-
-
- <table name="RHQ_ROLE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="FSYSTEM" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_ROLE_NAME_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_ROLE_LDAP_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="LDAP_GROUP_NAME" size="128" required="true" type="VARCHAR2"/>
-
- <index name="RHQ_ROLE_LDAP_GROUP_IDX" unique="true">
- <field ref="ROLE_ID"/>
- <field ref="LDAP_GROUP_NAME"/>
- </index>
- </table>
-
- <table name="RHQ_PERMISSION">
- <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
- <column name="OPERATION" type="INTEGER" required="true"/>
- <constraint name="RHQ_PERMISSION_PK">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="OPERATION"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
-
- <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
- <primaryKey>
- <field ref="SUBJECT_ID"/>
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_LDAP_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <constraint name="RHQ_SUBJECT_ROLE_LDAP_MAP_PK">
- <primaryKey>
- <field ref="SUBJECT_ID" />
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-<!-- END: authz-schema.xml -->
-<!-- BEGIN: search-schema.xml -->
-
-
- <table name="RHQ_SAVED_SEARCH">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONTEXT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500" required="false"/>
- <column name="PATTERN" type="VARCHAR2" size="1000" required="true"/>
-
- <column name="LAST_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="RESULT_COUNT" type="LONG" required="false"/>
-
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="true"/>
- <column name="GLOBAL" type="BOOLEAN" required="true"/>
- </table>
-
-<!-- END: search-schema.xml -->
-<!-- BEGIN: dashboard-schema.xml -->
-
-
-
- <table name="RHQ_DASHBOARD">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" required="true" references="RHQ_SUBJECT"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="SHARED" type="BOOLEAN" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- </table>
-
-
- <table name="RHQ_DASHBOARD_PORTLET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="PORTLET_KEY" type="VARCHAR2" size="200" required="true"/>
- <column name="COL" type="INTEGER" required="true"/>
- <column name="COL_INDEX" type="INTEGER" required="true"/>
- <column name="HEIGHT" type="INTEGER" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="DASHBOARD_ID" type="INTEGER" required="false" references="RHQ_DASHBOARD"/>
- </table>
-
-<!-- END: dashboard-schema.xml -->
-<!-- BEGIN: operation-schema.xml -->
-
-
- <table name="RHQ_OPERATION_DEF">
-
- <!-- === required columns === -->
-
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
-
- <!-- === optional columns === -->
-
- <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
-
- <!-- A parameter config definition is only required for operations that have parameters. -->
- <!-- A results config definition is only required for operations that return data. -->
- <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
- <column name="TIMEOUT" type="INTEGER"/>
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
- <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
-
- </table>
-
- <table name="RHQ_OPERATION_HISTORY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="STIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="CTIME"/>
- </index>
-
- </table>
-
- <!--
- This table is really just to support some specific use-cases.
- Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
- and to be able to query a list of all schedules along with their associated resource/group IDs
- possibly sorted by their next fire time.
- Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
- we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
- code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
- -->
- <table name="RHQ_OPERATION_SCHEDULE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
-
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <!--
- Note, this is the same as the primary key that Quartz uses for its schedules (RHQ_QRTZ_JOB_DETAILS).
- We do not need to add DTYPE to the key, because we ensure the name/group are unique across resource/group
- schedules
- -->
- <!-- === business key (JOB_NAME + JOB_GROUP) === -->
- <index name="RHQ_OPERATION_SCHEDULE_KEY_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- </table>
-
-<!-- END: operation-schema.xml -->
-<!-- BEGIN: event-schema.xml -->
-
-
- <!-- metadata -->
-
- <table name="RHQ_EVENT_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
-
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_EVENT_DEF_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- instance data -->
-
- <table name="RHQ_EVENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
-
- <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
-
- <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
- <field ref="EVENT_DEF_ID"/>
- <field ref="RESOURCE_ID"/>
- <field ref="LOCATION"/>
- </index>
- </table>
-
- <table name="RHQ_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
-
- <column name="TIMESTAMP" required="true" type="LONG"/>
- <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
- <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
- <index name="RHQ_EVENT_IDX" unique="false">
- <field ref="EVENT_SOURCE_ID"/>
- <field ref="TIMESTAMP"/>
- </index>
- </table>
-
-<!-- END: event-schema.xml -->
-<!-- BEGIN: alert-schema.xml -->
-
-
- <table name="RHQ_ALERT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARENT_ID" type="INTEGER" required="false"/>
- <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
- <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
- <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
- <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
- <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
-
- <column name="REQUIRED" required="true" type="SMALLINT"/>
-
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
- <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
- <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
- <column name="DAMPENING_VALUE" type="INTEGER"/>
- <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
- <column name="DAMPENING_PERIOD" type="INTEGER"/>
- <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
- </table>
-
- <table name="RHQ_ALERT_DAMPEN_EVENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
- <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
-
- <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
- <field ref="EVENT_TYPE"/>
- </index>
- <index name="RHQ_DAMPENING_EVENT_TS_IDX">
- <field ref="EVENT_TIMESTAMP"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_CONDITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
- <!--
- <column name="REQUIRED" required="true" type="BOOLEAN"/>
- -->
- <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
- <column name="NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
- <column name="THRESHOLD" required="false" type="DOUBLE"/>
- <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
- <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="TRIGGER_ID" required="false" type="INTEGER"/>
- </table>
-
- <table name="RHQ_ALERT" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="ACK_TIME" required="false" type="LONG"/>
- <column name="ACK_SUBJECT" required="false" size="100" type="VARCHAR2"/>
- <index name="RHQ_ALERT_IDX_TIME" unique="false">
- <field ref="CTIME"/>
- </index>
- <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
- <field ref="ALERT_DEFINITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIF_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <index name="RHQ_ALERT_IDX_ALERT" unique="false">
- <field ref="ALERT_ID"/>
- </index>
- <column name="SENDER" required="false" size="100" type="VARCHAR2"/>
- <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/>
- <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_ALERT_CONDITION_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
- <column name="VALUE" required="true" size="250" type="VARCHAR2"/>
- <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
- <field ref="CTIME" />
- </index>
- <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
- <field ref="ALERT_ID"/>
- </index>
- <index name="RHQ_ALERT_COND_LOG_COND_IDX">
- <field ref="CONDITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIFICATION" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="SENDER_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="EXTRA_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="SENDER_NAME" required="true" size="100" type="VARCHAR2" />
- </table>
-
-<!-- END: alert-schema.xml -->
-<!-- BEGIN: sysconfig-schema.xml -->
-
-
- <table name="RHQ_SYSTEM_CONFIG">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
- <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
-
- <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
- <field ref="PROPERTY_KEY"/>
- </index>
- </table>
-
-<!-- END: sysconfig-schema.xml -->
-<!-- BEGIN: scheduler-schema.xml -->
-
-
- <table name="RHQ_QRTZ_JOB_DETAILS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
- <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
- <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
- <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="JOB_DATA" required="false" type="BLOB"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_JOB_LISTENERS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="JOB_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
- <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
- <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
- <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
- <column name="JOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
- <field ref="NEXT_FIRE_TIME"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
- <field ref="TRIGGER_STATE"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
- <field ref="TRIGGER_STATE"/>
- <field ref="NEXT_FIRE_TIME"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="REPEAT_COUNT" type="LONG" required="true"/>
- <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
- <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_CRON_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
- <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_BLOB_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="BLOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- <field ref="TRIGGER_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_FIRED_TRIGGERS">
- <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="FIRED_TIME" type="LONG" required="true"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="STATE" type="VARCHAR2" size="16" required="true"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
- <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
- <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
- <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
- <field ref="TRIGGER_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
- <field ref="INSTANCE_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
- <field ref="JOB_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
- <field ref="JOB_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_CALENDARS">
- <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="CALENDAR" type="BLOB" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
- <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_SCHEDULER_STATE">
- <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
- <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
- <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
- </table>
-
- <table name="RHQ_QRTZ_LOCKS">
- <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
- <data LOCK_NAME="TRIGGER_ACCESS"/>
- <data LOCK_NAME="JOB_ACCESS"/>
- <data LOCK_NAME="CALENDAR_ACCESS"/>
- <data LOCK_NAME="STATE_ACCESS"/>
- <data LOCK_NAME="MISFIRE_ACCESS"/>
- </table>
-
-<!-- END: scheduler-schema.xml -->
-<!-- BEGIN: amps-schema.xml -->
-
-
- <table name="RHQ_PLUGIN">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
- <column name="AMPS_VERSION" size="16" type="VARCHAR2" required="false"/>
- <column name="ENABLED" type="BOOLEAN" required="true"/>
- <column name="STATUS" size="16" type="VARCHAR2" required="true"/>
- <column name="HELP" type="CLOB" required="false"/>
- <column name="PATH" size="500" type="VARCHAR2" required="true"/>
- <column name="MD5" size="100" type="VARCHAR2" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DEPLOYMENT" size="8" type="VARCHAR2" required="true"/>
- <column name="PTYPE" size="200" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="JOBS_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT" type="BLOB" required="false"/>
-
- <index name="RHQ_PLUGIN_NAME_DEPLOY_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="DEPLOYMENT"/>
- </index>
- </table>
-
-<!-- END: amps-schema.xml -->
-<!-- BEGIN: measurement-schema.xml -->
-
- <table name="RHQ_MEASUREMENT_DEF">
-
- <!-- === required columns === -->
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
-
- <!-- === optional columns === -->
- <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
- <column name="CATEGORY" type="SMALLINT"/>
- <column name="UNITS" type="SMALLINT"/>
- <column name="NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DISPLAY_TYPE" type="SMALLINT"/>
- <column name="DATA_TYPE" type="SMALLINT"/>
- <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
- <column name="DEFAULT_INTERVAL" type="LONG" />
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
- <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
-
- <column name="VERSION" type="INTEGER"/>
- <!-- for optimistic locking -->
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
- <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- <field ref="RAW_NUMERIC_TYPE"/>
- </index>
- <index name="RHQ_METRIC_DEF_NT_IDX">
- <field ref="NUMERIC_TYPE"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_SCHED">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="ENABLED" type="BOOLEAN" default="false"/>
- <column name="MTIME" type="LONG" />
- <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
- <column name="VERSION" type="INTEGER" />
- <column name="COLL_INTERVAL" type="LONG" />
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
- <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
- <field ref="RESOURCE_ID"/>
- <field ref="DEFINITION"/>
- </index>
- <index name="RHQ_MEAS_SCHED_RESID_IDX">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_BLINE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
- <column name="BL_MIN" type="DOUBLE" required="true"/>
- <column name="BL_MAX" type="DOUBLE" required="true"/>
- <column name="BL_MEAN" type="DOUBLE" required="true"/>
- <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
- <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
- <field ref="BL_COMPUTE_TIME"/>
- </index>
- <index name="RHQ_MEAS_BASELINE_SID_IDX">
- <field ref="SCHEDULE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1D_TIME_IDX">
- <field ref="TIME_STAMP" />
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_TRAIT">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER" />
- <column name="VALUE" type="VARCHAR2" size="4000" />
- <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_KEY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
- <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
- <field ref="SCHEDULE_ID"/>
- <field ref="CALL_DESTINATION"/>
- </index>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_VALUE">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
- <column name="BEGIN_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="true"/>
- <column name="MINIMUM" type="DOUBLE" required="true"/>
- <column name="MAXIMUM" type="DOUBLE" required="true"/>
- <column name="TOTAL" type="DOUBLE" required="true"/>
- <column name="COUNT" type="LONG" required="true"/>
- <index name="RHQ_CT_DA_VA_END_TIM_IDX">
- <field ref="END_TIME"/>
- </index>
- </table>
-
-
- <table name="RHQ_AVAILABILITY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
- <column name="START_TIME" type="LONG" required="true" />
- <column name="END_TIME" type="LONG" required="false" />
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_AVAIL_RESOURCE_START_IDX">
- <field ref="RESOURCE_ID"/>
- <field ref="START_TIME"/>
- </index>
- <!-- only one null row can exist for any resource -->
- <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
- <field ref="RESOURCE_ID"/>
- <field ref="END_TIME" />
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_AVAIL">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_RESOURCE_AVAIL_IDX">
- <field ref="RESOURCE_ID" />
- </index>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB">
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB_TMP">
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_NUMBERS">
- <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
- </table>
-
-
- <table name="RHQ_MEAS_DATA_NUM_R00">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R00_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R01">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R01_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R02">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R02_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R03">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R03_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R04">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R04_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R05">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R05_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R06">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R06_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R07">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R07_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R08">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R08_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R09">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R09_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R10">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R10_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R11">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R11_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R12">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R12_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R13">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R13_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R14">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R14_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: measurement-schema.xml -->
-<!-- BEGIN: content-schema.xml -->
-
-
- <table name="RHQ_ARCHITECTURE">
- <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="50" type="VARCHAR2" required="true"/>
- <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_GROUP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- <column name="REPO_GROUP_TYPE_ID" type="INTEGER" references="RHQ_REPO_GROUP_TYPE" required="true"/>
-
- <index name="RHQ_REPO_GROUP_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="REPO_GROUP_TYPE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
- <!-- we might want this as part of natural key -->
- <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
-
- <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <!-- <field ref="PLUGIN_NAME"/> -->
- </index>
- </table>
-
- <table name="RHQ_CONTENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="CONTENT_SOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_REPO">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
- <column name="IS_CANDIDATE" type="BOOLEAN" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="OWNER_ID" type="INTEGER" required="false" references="RHQ_SUBJECT" />
- <column name="IS_PRIVATE" type="BOOLEAN" required="true" />
-
- <index name="RHQ_REPO_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_RELATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RELATED_REPO_ID" type="INTEGER" references="RHQ_REPO" required="true"/>
- <column name="REPO_RELATION_TYPE_ID" type="INTEGER" references="RHQ_REPO_RELATION_TYPE" required="true"/>
- </table>
-
-
-
- <table name="RHQ_PACKAGE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
- <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
- <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
-
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
- <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
-
- <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
-
- <index name="RHQ_PACKAGE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="PACKAGE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PACKAGE_BITS">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BITS" type="LARGEOBJECT" required="false"/>
- </table>
-
- <table name="RHQ_PACKAGE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
- <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
- <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="FILE_SIZE" type="LONG" required="false"/>
- <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
- <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
- <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
- <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
- <column name="METADATA" type="BLOB" required="false"/>
-
- <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
- <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
- <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
-
- <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
- <field ref="PACKAGE_ID"/>
- <field ref="VERSION"/>
- <field ref="ARCHITECTURE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_CONTENT_REQ">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- </table>
-
- <table name="RHQ_INSTALLED_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="INSTALLATION_TIME" type="LONG" required="false"/>
-
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
- </table>
-
- <table name="RHQ_INSTALLED_PKG_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
-
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
- </table>
-
- <table name="RHQ_CONTENT_SRC_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- </table>
-
- <table name="RHQ_REPO_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="PERCENT_COMPLETE" type="LONG" required="false"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- </table>
-
-
- <table name="RHQ_PACKAGE_INST_STEP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
- <column name="STEP_ORDER" type="INTEGER" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
- <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
- <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
- </table>
-
- <table name="RHQ_REPO_RESOURCE_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP"> 1
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_GROUP_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_GROUP_ID" type="INTEGER" required="true" references="RHQ_REPO_GROUP"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_RELATION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_RELATION_ID" type="INTEGER" required="true" references="RHQ_REPO_RELATION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_RELATION_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_RELATION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_REPO_PKG_VERSION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- <index name="RHQ_REPO_PKG_VER_MAP_IDX" unique="false">
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
-
- <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
- <primaryKey>
- <field ref="PACKAGE_VERSION_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PKG_PRD_MAP">
- <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
-
- <constraint name="RHQ_PKG_PRD_KEY">
- <primaryKey>
- <field ref="PKG_ID"/>
- <field ref="PRD_ID"/>
- </primaryKey>
- </constraint>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_TYPE_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION_TYPE"/>
- <column name="LABEL" size="64" type="VARCHAR2" required="true"/>
- <column name="BASE_PATH" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_DISTRIBUTION_IDX" unique="true">
- <field ref="LABEL"/>
- <field ref="BASE_PATH"/>
- </index>
-
- </table>
-
- <table name="RHQ_REPO_DISTRIBUTION">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_DIST_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="DISTRIBUTION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-
- <table name="RHQ_DISTRIBUTION_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="RELATIVE_FILENAME" size="256" type="VARCHAR2" required="true"/>
- <!--<column name="FILE_SIZE" type="NUMBER" required="true"/>-->
- <column name="MD5SUM" size="64" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
- <!--<column name="CTIME" type="LONG" required="true"/>-->
-
- <index name="RHQ_DISTRIBUTION_FILE_IDX" unique="true">
- <field ref="DISTRIBUTION_ID"/>
- <field ref="RELATIVE_FILENAME"/>
- </index>
- </table>
-
-
-
-
- <table name="RHQ_ADVISORY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY" size="64" type="VARCHAR2" required="true"/>
- <column name="ADVISORY_TYPE" size="64" type="VARCHAR2" required="true" />
- <column name="ADVISORY_REL" size="64" type="VARCHAR2" required="false"/>
- <column name="ADVISORY_NAME" size="64" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SYNOPSIS" size="4000" type="VARCHAR2" required="true"/>
- <column name="TOPIC" size="4000" type="VARCHAR2" required="false"/>
- <column name="SOLUTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/>
- <column name="ISSUE_DATE" type="LONG" required="false"/>
- <column name="UPDATE_DATE" type="LONG" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_NAME_UQ" unique="true">
- <field ref="ADVISORY_NAME"/>
- </index>
-
- <index name="RHQ_ADVISORY_UQ" unique="true">
- <field ref="ADVISORY"/>
- </index>
-
- <index name="RHQ_ADVISORY_UDATE_IDX" unique="false">
- <field ref="UPDATE_DATE"/>
- </index>
- </table>
-
- <table name="RHQ_ADVISORY_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_PKG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_CVE">
- <column name="ID" default="sequence-only" initial="101" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="64" type="VARCHAR2" required="true"/>
- </table>
-
- <table name="RHQ_ADVISORY_CVE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="CVE_ID" type="INTEGER" required="true" references="RHQ_CVE"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_CVE_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="CVE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_ADVISORY_BUGLIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="BUG_ID" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_BUG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="BUG_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_ADVISORY">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_ADV_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="ADVISORY_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_TYPE is things like "Cobbler profile" or "file-based bundle" or "puppet recipe" -->
- <table name="RHQ_BUNDLE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
- <table name="RHQ_BUNDLE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/>
- <column name="PACKAGE_TYPE_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_TYPE"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_UNIQUE" unique="true">
- <field ref="BUNDLE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE_VERSION represents an actual piece of content that needs to be installed somewhere -->
- <table name="RHQ_BUNDLE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="VERSION_ORDER" type="INTEGER" required="true"/>
- <column name="ACTION" type="CLOB" required="true"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="NAME"/>
- <field ref="VERSION"/>
- </index>
- </table>
-
- <!-- Many-to-many table that links many repos to a particular bundle version. destination platforms -->
- <!-- would be required to have associations to the specified repos (to access required content -->
- <table name="RHQ_BUNDLE_VERSION_REPO">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <constraint name="RHQ_BUNDLE_VERSION_REPO_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="REPO_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_FILE represents a file that is associated with (possibly bundled inside) a bundle version -->
- <table name="RHQ_BUNDLE_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- </table>
-
- <!-- A logical destination for a bundle deployment. Defines the platforms and directory on those targets. -->
- <table name="RHQ_BUNDLE_DESTINATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="DEPLOY_DIR" size="256" type="VARCHAR2" required="true"/>
- <column name="DEST_BASE_DIR_NAME" size="200" type="VARCHAR2" required="true"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_DESTINATION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="GROUP_ID"/>
- <field ref="DEPLOY_DIR"/>
- </index>
- </table>
-
- <!-- An actual deployment of a bundle version to a destination, with a specific config. Bundle deployments
- can differ only on ctime, which is assumed to be different -->
- <table name="RHQ_BUNDLE_DEPLOYMENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="IS_LIVE" type="BOOLEAN" required="true"/>
- <column name="REPLACED_BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_DEPLOYMENT"/>
- </table>
-
- <!-- Represents a bundle version that is deployed on a platform resource -->
- <table name="RHQ_BUNDLE_RES_DEPLOY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT" />
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE" />
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_BUNDLE_RES_DEPLOY_IDX" unique="true">
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_BUNDLE_RES_DEP_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_RES_DEPLOY_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_RES_DEPLOY" />
- <column name="SUBJECT_NAME" required="false" size="255" type="VARCHAR2"/>
- <column name="AUDIT_TIME" required="true" type="LONG"/>
- <column name="ACTION" required="true" size="128" type="VARCHAR2"/>
- <column name="INFO" required="true" size="512" type="VARCHAR2"/>
- <column name="CATEGORY" required="false" size="32" type="VARCHAR2"/>
- <column name="STATUS" required="true" type="VARCHAR2" size="16"/>
- <column name="MESSAGE" required="false" type="LONGVARCHAR"/>
- <column name="ATTACHMENT" required="false" type="LONGVARCHAR"/>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_MAP">
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_VERSION_MAP">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_VER_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEPLOY_MAP">
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DEP_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEST_MAP">
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DES_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DESTINATION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Drift Management Tables -->
- <table name="RHQ_DRIFT_DEF_TEMPLATE">
- <column name="ID" default="sequence-only" initial="1001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="NAME" type="VARCHAR2" size="128" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <!-- true if defined by user, false if provided by plugin -->
- <column name="IS_USER_DEFINED" type="BOOLEAN" required="true"/>
- <!--
- Change sets are managed by the drift server plugins; therefore, we cannot maintain
- a FK constraint on the change set id. And the type cannot be integer because
- other back ends like MongoDB use other types that are basically variants of a
- UUID
-
- jsanda
- -->
- <column name="DRIFT_CHANGE_SET_ID" type="VARCHAR2" size="64" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_DRIFT_DEF_TEMPLATE_UNIQUE" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Content of a file being managed for drift. Used for diff and/or remediation -->
- <table name="RHQ_DRIFT_FILE">
- <column name="HASH_ID" type="VARCHAR2" size="64" primarykey="true" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="DATA" type="LARGEOBJECT" required="false"/>
- <column name="DATA_SIZE" type="LONG" required="false"/>
- <column name="STATUS" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single drift definition defining file tracking
- Note: A resource or group (todo: group, other?) can have zero or more drift configurations.
- Note: The name, interval and is_enabled values are also stored withing the referenced config.
- This allows us to use the config editor to manipulate all fields.
- Note: Name is read-only
- Note: Interval unit is millis
- -->
- <table name="RHQ_DRIFT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEF_TEMPLATE_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEF_TEMPLATE"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="NAME" type="VARCHAR2" size="128" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <column name="INTERVAL" type="LONG" required="true"/>
- <column name="IS_ENABLED" type="BOOLEAN" required="true"/>
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- <column name="IS_PINNED" type="BOOLEAN" required="true"/>
- <column name="IS_ATTACHED" type="BOOLEAN" required="true"/>
- </table>
-
- <table name="RHQ_DRIFT_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- </table>
-
- <!-- A drift change-set report for a resource -->
- <table name="RHQ_DRIFT_CHANGE_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="CTIME" type="LONG" required="true"/>
- <!-- Version 0 is initial change-set -->
- <column name="VERSION" type="INTEGER" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEFINITION"/>
- <!-- the drift handling mode at changeset creation time -->
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single occurence of drift for a resource -->
- <table name="RHQ_DRIFT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/>
- <!-- the file path not including the base directory -->
- <column name="PATH" type="VARCHAR2" size="1024" required="true"/>
- <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search.
- this field can be considered transient for serialization purposes -->
- <column name="PATH_DIRECTORY" type="VARCHAR2" size="1024" required="true"/>
- <column name="OLD_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- <column name="NEW_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- </table>
-
-
-<!-- END: content-schema.xml -->
-<!-- BEGIN: resource-request-schema.xml -->
-
-
- <table name="RHQ_CREATE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
- <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
- </table>
-
- <table name="RHQ_DELETE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- </table>
-
-<!-- END: resource-request-schema.xml -->
-<!-- BEGIN: jms-schema.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-
-
- <table name="JMS_MESSAGES">
- <column name="MESSAGEID" required="true" type="INTEGER" />
- <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
- <column name="TXID" required="false" type="INTEGER" />
- <column name="TXOP" required="false" type="CHAR" size="1" />
- <column name="MESSAGEBLOB" required="false" type="BLOB" />
-
- <constraint name="JMS_MESSAGES_PKEY">
- <primaryKey>
- <field ref="MESSAGEID"/>
- <field ref="DESTINATION"/>
- </primaryKey>
- </constraint>
-
- <index name="JMS_MESSAGES_TXOP_TXID">
- <field ref="TXOP"/>
- <field ref="TXID"/>
- </index>
- <index name="JMS_MESSAGES_DESTINATION">
- <field ref="DESTINATION"/>
- </index>
- </table>
-
- <table name="JMS_TRANSACTIONS">
- <column name="TXID" required="true" type="INTEGER" primarykey="true" />
- </table>
-
- <table name="JMS_USERS">
- <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
- <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
- <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
- </table>
-
- <table name="JMS_ROLES">
- <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
- <column name="USERID" required="true" type="VARCHAR2" size="32" />
-
- <constraint name="JMS_ROLES_PKEY">
- <primaryKey>
- <field ref="USERID"/>
- <field ref="ROLEID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="JMS_SUBSCRIPTIONS">
- <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
- <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
- <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
- <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
-
- <constraint name="JMS_SUBSCRIPTIONS_PKEY">
- <primaryKey>
- <field ref="CLIENTID"/>
- <field ref="SUBNAME"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: jms-schema.xml -->
-<!-- BEGIN: obsolete-schema.xml -->
-
-
- <!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in this file! -->
- <!-- NOTE: So, put the table you want dropped first at the bottom, and so on... -->
-
-
- <!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
-
- <table name="RHQ_BUNDLE_CONFIG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <!-- this probably needs a DTYPE discriminator so we know if its a bundle or a specific bundle version -->
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/>
- </table>
-
- <table name="RHQ_CHANNEL" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <index name="RHQ_CHANNEL_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_CHANNEL_RESOURCE_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_CONTENT_SRC_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_PKG_VERSION_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- !!! REMOVED FROM MEASUREMENT-SCHEMA !!!! -->
-
- <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="OCCURRED" type="LONG" required="true"/>
- <column name="DIFF" type="DOUBLE" required="true"/>
-
- <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
- <field ref="SCHEDULE_ID" />
- <field ref="OCCURRED" />
- </index>
- </table>
-
-
- <table name="RHQ_TAG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
- <table name="RHQ_REPO_TAG_MAP" obsolete="true">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAG"/>
-
- <constraint name="RHQ_REPO_TAG_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-<!-- END: obsolete-schema.xml -->
-</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml
deleted file mode 100644
index 3fd833f..0000000
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml
+++ /dev/null
@@ -1,2649 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dbsetup name="schema">
-<!-- BEGIN: config-schema.xml -->
-
-
- <!-- Definition or Metadata tables -->
-
- <table name="RHQ_CONFIG_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CONFIG_FORMAT" type="VARCHAR2" required="false" size="32"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_GRP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
- <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_DEF">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
- <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="REQUIRED" type="BOOLEAN" required="false"/>
- <column name="READONLY" type="BOOLEAN" required="false"/>
- <column name="SUMMARY" type="BOOLEAN" required="false"/>
- <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
- <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
-
- <!-- only simple properties (not lists and maps) have this -->
- <column name="UNITS" type="SMALLINT" required="false"/>
-
- <!-- only dynamic properties (not simple) have this -->
- <column name="DYNAMIC_TYPE" type="VARCHAR2" size="20" required="false"/>
- <column name="DYNAMIC_KEY" type="VARCHAR2" size="128" required="false"/>
- </table>
-
- <table name="RHQ_CONF_PROP_DEF_ENUM">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PD_OSRC">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="LINK_TO_TARGET" type="BOOLEAN" required="false"/>
- <column name="FILTER" type="VARCHAR2" required="false" size="40"/>
- <column name="EXPRESSION" type="VARCHAR2" required="true" size="400"/>
- <column name="TARGET_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- </table>
-
- <table name="RHQ_CONFIG_PROP_CONSTR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
- <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
- <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
- <column name="ORDER_INDEX" type="INTEGER" required="false"/>
- </table>
-
-
- <!-- Content or value tables -->
-
- <table name="RHQ_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
- <table name="RHQ_CONFIG_PROPERTY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
- <column name="OVERRIDE" type="BOOLEAN" required="false"/>
- <column name="NAME" type="VARCHAR2" required="true" size="255"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
- http://support.microsoft.com/kb/321843 -->
- <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
- <column name="LIST_INDEX" type="INTEGER"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
- <field ref="CONFIGURATION_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
- <field ref="PARENT_MAP_ID"/>
- <field ref="NAME"/>
- </index>
- <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
- <field ref="PARENT_LIST_ID"/>
- </index>
- <!-- List entries all have the same name -->
- </table>
-
- <table name="RHQ_CONFIG_TEMPLATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
- <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
- </table>
-
- <table name="RHQ_RAW_CONFIG">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG(ID)"/>
- <column name="PATH" type="VARCHAR2" required="false" size="512"/>
- <column name="CONTENTS" type="CLOB" required="true"/>
- <column name="SHA256" type="VARCHAR2" size="64" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- </table>
-
-<!-- END: config-schema.xml -->
-<!-- BEGIN: cluster-schema.xml -->
-
- <table name="RHQ_AFFINITY_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_SERVER">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="SECURE_PORT" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
- <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- new agent -->
- <table name="RHQ_AGENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="255" type="VARCHAR2"/>
- <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
- <column name="PORT" required="true" type="INTEGER"/>
- <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
- <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="MTIME" required="true" type="LONG"/>
- <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
- <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
- <column name="STATUS" type="INTEGER" required="false" default="0" />
- <column name="BACKFILLED" type="BOOLEAN" required="true" />
-
- <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
-
- <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
- <field ref="ADDRESS"/>
- <field ref="PORT"/>
- </index>
-
- <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
- <field ref="AGENTTOKEN"/>
- </index>
- </table>
-
- <table name="RHQ_PARTITION_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="SUBJECT_NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
- <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
- <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_PARTITION_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
- <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
- </table>
-
- <table name="RHQ_FAILOVER_LIST">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
- <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
- <column name="CTIME" required="true" type="LONG"/>
- </table>
-
- <table name="RHQ_FAILOVER_DETAILS">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
- <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
- <column name="ORDINAL" type = "INTEGER" required="true"/>
- </table>
-
-<!-- END: cluster-schema.xml -->
-<!-- BEGIN: auth-schema.xml -->
-
-
- <table name="RHQ_PRINCIPAL">
-
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
- <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
-
- <!-- ensure that principals are unique -->
- <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
- <field ref="PRINCIPAL"/>
- </index>
-
- </table>
-
- <table name="RHQ_SUBJECT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
- <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
- <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
- <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
- <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-<!-- END: auth-schema.xml -->
-<!-- BEGIN: inventory-schema.xml -->
-
-
- <!-- NEW RESOURCE TYPES -->
- <table name="RHQ_RESOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
- <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
- <column name="SINGLETON" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="PLUGIN" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="DELETED" type="BOOLEAN" default="FALSE" required="TRUE"/>
- <column name="SUBCATEGORY_ID" type="INTEGER"/>
- <!--
- TODO add support to DB setup for tables with circular dependencies and then add back this RI
- <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
- -->
- <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="BUNDLE_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG"/>
-
- <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
- <field ref="NAME"/>
- <field ref="PLUGIN"/>
- </index>
- </table>
-
- <!-- NEW RESOURCE SUBCATEGORIES -->
- <table name="RHQ_RESOURCE_SUBCAT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
- <!-- resourceTypeId is not required on child sub categories -->
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <!-- Many To Many mapping for resource type to its parents -->
- <table name="RHQ_RESOURCE_TYPE_PARENTS">
- <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
- <primaryKey>
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="PARENT_RESOURCE_TYPE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PROCESS_SCAN">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
- <column name="NAME" type="VARCHAR2" size="100" required="false"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
-
- <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
- <field ref="QUERY"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PRD_VER">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="VERSION" type="VARCHAR2" size="100" required="true"/>
- <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- </table>
-
- <table name="RHQ_RESOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="UUID" type="CHAR" size="36" required="true"/>
- <column name="NAME" type="VARCHAR2" size="500"/>
- <!-- ancestry holds the full parental ancestry, used for disambiguation -->
- <column name="ANCESTRY" type="VARCHAR2" required="false" size="4000"/>
- <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
- <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
- <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
- <column name="CONNECTED" type="BOOLEAN"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
- <column name="VERSION" type="VARCHAR2" size="100"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="ITIME" type="LONG"/>
- <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
-
- <index name="RHQ_RESOURCE_idx_key">
- <field ref="RESOURCE_KEY"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_type">
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_agent">
- <field ref="AGENT_ID"/>
- </index>
-
- <index name="RHQ_RESOURCE_idx_parent">
- <field ref="PARENT_RESOURCE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_RESOURCE_ERROR">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TIME_OCCURRED" type="LONG" required="true"/>
- <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
- <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
- <column name="DETAIL" type="LONGVARCHAR" required="false"/>
-
- <index name="RHQ_RES_ERROR_IDX_RES_ID">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_GROUP_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="CALC_TIME" type="LONG"/>
- <column name="CALC_INTERVAL" type="LONG"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
- <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_GROUP_DEF_NAME" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
- <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
- <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
- <!-- Compatible groups only -->
- <column name="CTIME" type="LONG"/>
- <column name="MTIME" type="LONG"/>
- <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
- <column name="RECURSIVE" type="BOOLEAN"/>
-
- <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
- <column name="GROUP_BY" size="500" type="VARCHAR2"/>
-
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
-
- <!-- This is only set if this is a subject-owned group (like an autogroup) -->
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT"/>
-
- <!-- These two only set if this is a backing group for a resource auto-cluster -->
- <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
- <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- This is only set if this is a backing group for a resource auto-group -->
- <column name="AUTO_GROUP_PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
-
- <column name="VISIBLE" type="BOOLEAN"/>
-
- <index name="RHQ_RES_GROUP_NAME" unique="false">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Many To Many mapping for groups to implicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Many To Many mapping for groups to explicit resources -->
- <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
- <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <!-- not using full words to fit index name length -->
- <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CONFIG_GROUP_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
- <table name="RHQ_CONFIG_UPDATE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
- </table>
-
-
- <table name="RHQ_TAGGING">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="NAMESPACE" type="VARCHAR2" required="false" size="20"/>
- <column name="SEMANTIC" type="VARCHAR2" required="false" size="50"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
- </table>
-
- <table name="RHQ_TAGGING_RESOURCE_MAP">
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_RES_GROUP_MAP">
- <column name="RESOURCE_GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="RESOURCE_GROUP_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: inventory-schema.xml -->
-<!-- BEGIN: authz-schema.xml -->
-
-
- <table name="RHQ_ROLE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
- <column name="FSYSTEM" type="BOOLEAN" default="false"/>
-
- <index name="RHQ_ROLE_NAME_KEY" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
-
- <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="RESOURCE_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_ROLE_LDAP_GROUP">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <column name="LDAP_GROUP_NAME" size="128" required="true" type="VARCHAR2"/>
-
- <index name="RHQ_ROLE_LDAP_GROUP_IDX" unique="true">
- <field ref="ROLE_ID"/>
- <field ref="LDAP_GROUP_NAME"/>
- </index>
- </table>
-
- <table name="RHQ_PERMISSION">
- <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
- <column name="OPERATION" type="INTEGER" required="true"/>
- <constraint name="RHQ_PERMISSION_PK">
- <primaryKey>
- <field ref="ROLE_ID"/>
- <field ref="OPERATION"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
-
- <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
- <primaryKey>
- <field ref="SUBJECT_ID"/>
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_SUBJECT_ROLE_LDAP_MAP">
- <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
- <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
- <constraint name="RHQ_SUBJECT_ROLE_LDAP_MAP_PK">
- <primaryKey>
- <field ref="SUBJECT_ID" />
- <field ref="ROLE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-<!-- END: authz-schema.xml -->
-<!-- BEGIN: search-schema.xml -->
-
-
- <table name="RHQ_SAVED_SEARCH">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONTEXT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500" required="false"/>
- <column name="PATTERN" type="VARCHAR2" size="1000" required="true"/>
-
- <column name="LAST_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="RESULT_COUNT" type="LONG" required="false"/>
-
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="true"/>
- <column name="GLOBAL" type="BOOLEAN" required="true"/>
- </table>
-
-<!-- END: search-schema.xml -->
-<!-- BEGIN: dashboard-schema.xml -->
-
-
-
- <table name="RHQ_DASHBOARD">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" required="true" references="RHQ_SUBJECT"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="SHARED" type="BOOLEAN" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- </table>
-
-
- <table name="RHQ_DASHBOARD_PORTLET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" type="VARCHAR2" size="200" required="true"/>
- <column name="PORTLET_KEY" type="VARCHAR2" size="200" required="true"/>
- <column name="COL" type="INTEGER" required="true"/>
- <column name="COL_INDEX" type="INTEGER" required="true"/>
- <column name="HEIGHT" type="INTEGER" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="DASHBOARD_ID" type="INTEGER" required="false" references="RHQ_DASHBOARD"/>
- </table>
-
-<!-- END: dashboard-schema.xml -->
-<!-- BEGIN: operation-schema.xml -->
-
-
- <table name="RHQ_OPERATION_DEF">
-
- <!-- === required columns === -->
-
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" required="true" size="100"/>
-
- <!-- === optional columns === -->
-
- <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
-
- <!-- A parameter config definition is only required for operations that have parameters. -->
- <!-- A results config definition is only required for operations that return data. -->
- <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
- <column name="TIMEOUT" type="INTEGER"/>
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
- <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
-
- </table>
-
- <table name="RHQ_OPERATION_HISTORY">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="STIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="CTIME"/>
- </index>
-
- </table>
-
- <!--
- This table is really just to support some specific use-cases.
- Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
- and to be able to query a list of all schedules along with their associated resource/group IDs
- possibly sorted by their next fire time.
- Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
- we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
- code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
- -->
- <table name="RHQ_OPERATION_SCHEDULE">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
-
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
- <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
-
- <!-- for resource history -->
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
-
- <!-- for group history -->
- <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
-
- <!--
- Note, this is the same as the primary key that Quartz uses for its schedules (RHQ_QRTZ_JOB_DETAILS).
- We do not need to add DTYPE to the key, because we ensure the name/group are unique across resource/group
- schedules
- -->
- <!-- === business key (JOB_NAME + JOB_GROUP) === -->
- <index name="RHQ_OPERATION_SCHEDULE_KEY_IDX" unique="true">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- </table>
-
-<!-- END: operation-schema.xml -->
-<!-- BEGIN: event-schema.xml -->
-
-
- <!-- metadata -->
-
- <table name="RHQ_EVENT_DEF">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
-
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
-
- <index name="RHQ_EVENT_DEF_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- instance data -->
-
- <table name="RHQ_EVENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
-
- <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
-
- <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
- <field ref="EVENT_DEF_ID"/>
- <field ref="RESOURCE_ID"/>
- <field ref="LOCATION"/>
- </index>
- </table>
-
- <table name="RHQ_EVENT">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
-
- <column name="TIMESTAMP" required="true" type="LONG"/>
- <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
- <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
- <index name="RHQ_EVENT_IDX" unique="false">
- <field ref="EVENT_SOURCE_ID"/>
- <field ref="TIMESTAMP"/>
- </index>
- </table>
-
-<!-- END: event-schema.xml -->
-<!-- BEGIN: alert-schema.xml -->
-
-
- <table name="RHQ_ALERT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="100" type="VARCHAR2"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="PARENT_ID" type="INTEGER" required="false"/>
- <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
- <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
- <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
- <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
- <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
-
- <column name="REQUIRED" required="true" type="SMALLINT"/>
-
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
- <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
- <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
-
- <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
- <column name="DAMPENING_VALUE" type="INTEGER"/>
- <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
- <column name="DAMPENING_PERIOD" type="INTEGER"/>
- <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
- </table>
-
- <table name="RHQ_ALERT_DAMPEN_EVENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
- <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
-
- <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
- <field ref="EVENT_TYPE"/>
- </index>
- <index name="RHQ_DAMPENING_EVENT_TS_IDX">
- <field ref="EVENT_TIMESTAMP"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_CONDITION">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
- <!--
- <column name="REQUIRED" required="true" type="BOOLEAN"/>
- -->
- <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
- <column name="NAME" required="false" size="100" type="VARCHAR2"/>
- <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
- <column name="THRESHOLD" required="false" type="DOUBLE"/>
- <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
- <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="TRIGGER_ID" required="false" type="INTEGER"/>
- </table>
-
- <table name="RHQ_ALERT" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="RECOVERY_ID" type="INTEGER" required="true"/>
- <!-- required, but 0 effectively means null -->
- <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
- <column name="ACK_TIME" required="false" type="LONG"/>
- <column name="ACK_SUBJECT" required="false" size="100" type="VARCHAR2"/>
- <index name="RHQ_ALERT_IDX_TIME" unique="false">
- <field ref="CTIME"/>
- </index>
- <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
- <field ref="ALERT_DEFINITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIF_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <index name="RHQ_ALERT_IDX_ALERT" unique="false">
- <field ref="ALERT_ID"/>
- </index>
- <column name="SENDER" required="false" size="100" type="VARCHAR2"/>
- <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/>
- <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/>
- </table>
-
- <table name="RHQ_ALERT_CONDITION_LOG" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" required="true" type="LONG"/>
- <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
- <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
- <column name="VALUE" required="true" size="250" type="VARCHAR2"/>
- <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
- <field ref="CTIME" />
- </index>
- <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
- <field ref="ALERT_ID"/>
- </index>
- <index name="RHQ_ALERT_COND_LOG_COND_IDX">
- <field ref="CONDITION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_ALERT_NOTIFICATION" tablespace="DEFAULT"
- storage-options="freelists 5" cache="true" logging="false">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
- <column name="SENDER_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="EXTRA_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
- <column name="SENDER_NAME" required="true" size="100" type="VARCHAR2" />
- </table>
-
-<!-- END: alert-schema.xml -->
-<!-- BEGIN: sysconfig-schema.xml -->
-
-
- <table name="RHQ_SYSTEM_CONFIG">
- <column name="ID" default="sequence-only" initial="10001"
- primarykey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
- <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
- <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
-
- <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
- <field ref="PROPERTY_KEY"/>
- </index>
- </table>
-
-<!-- END: sysconfig-schema.xml -->
-<!-- BEGIN: scheduler-schema.xml -->
-
-
- <table name="RHQ_QRTZ_JOB_DETAILS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
- <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
- <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
- <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
- <column name="JOB_DATA" required="false" type="BLOB"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_JOB_LISTENERS">
- <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
- <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
-
- <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
- <primaryKey>
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- <field ref="JOB_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
- </table>
-
- <table name="RHQ_QRTZ_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
- <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
- <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
- <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
- <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
- <column name="JOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
- <foreignKey local="JOB_NAME,JOB_GROUP"
- references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
- <field ref="JOB_NAME"/>
- <field ref="JOB_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
- <field ref="NEXT_FIRE_TIME"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
- <field ref="TRIGGER_STATE"/>
- </index>
- <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
- <field ref="TRIGGER_STATE"/>
- <field ref="NEXT_FIRE_TIME"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
- <column name="REPEAT_COUNT" type="LONG" required="true"/>
- <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
- <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_CRON_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
- <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_BLOB_TRIGGERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="BLOB_DATA" type="BLOB" required="false"/>
-
- <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <!-- Commenting out, because Oracle auto-creates an index for the
- primary key column(s) and fails if you try to create another
- index for the same column(s) (ips, 03/29/07).
- -->
- <!--
- <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- -->
- </table>
-
- <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
-
- <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
- <primaryKey>
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- <field ref="TRIGGER_LISTENER"/>
- </primaryKey>
- </constraint>
- <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
- <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
- references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
- ondelete="cascade"/>
- </constraint>
-
- <!-- Quartz docs recommend this index. -->
- <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_FIRED_TRIGGERS">
- <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
- <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
- <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
- <column name="FIRED_TIME" type="LONG" required="true"/>
- <column name="PRIORITY" type="INTEGER" required="false"/>
- <column name="STATE" type="VARCHAR2" size="16" required="true"/>
- <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
- <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
- <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
- <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
- <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
-
- <!-- Quartz docs recommend these indexes. -->
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
- <field ref="TRIGGER_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
- <field ref="TRIGGER_NAME"/>
- <field ref="TRIGGER_GROUP"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
- <field ref="INSTANCE_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
- <field ref="JOB_NAME"/>
- </index>
- <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
- <field ref="JOB_GROUP"/>
- </index>
-
- </table>
-
- <table name="RHQ_QRTZ_CALENDARS">
- <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="CALENDAR" type="BLOB" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
- <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- </table>
-
- <table name="RHQ_QRTZ_SCHEDULER_STATE">
- <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
- <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
- <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
- <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
- </table>
-
- <table name="RHQ_QRTZ_LOCKS">
- <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
- <data LOCK_NAME="TRIGGER_ACCESS"/>
- <data LOCK_NAME="JOB_ACCESS"/>
- <data LOCK_NAME="CALENDAR_ACCESS"/>
- <data LOCK_NAME="STATE_ACCESS"/>
- <data LOCK_NAME="MISFIRE_ACCESS"/>
- </table>
-
-<!-- END: scheduler-schema.xml -->
-<!-- BEGIN: amps-schema.xml -->
-
-
- <table name="RHQ_PLUGIN">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
- <column name="AMPS_VERSION" size="16" type="VARCHAR2" required="false"/>
- <column name="ENABLED" type="BOOLEAN" required="true"/>
- <column name="STATUS" size="16" type="VARCHAR2" required="true"/>
- <column name="HELP" type="CLOB" required="false"/>
- <column name="PATH" size="500" type="VARCHAR2" required="true"/>
- <column name="MD5" size="100" type="VARCHAR2" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="DEPLOYMENT" size="8" type="VARCHAR2" required="true"/>
- <column name="PTYPE" size="200" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="JOBS_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT" type="BLOB" required="false"/>
-
- <index name="RHQ_PLUGIN_NAME_DEPLOY_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="DEPLOYMENT"/>
- </index>
- </table>
-
-<!-- END: amps-schema.xml -->
-<!-- BEGIN: measurement-schema.xml -->
-
- <table name="RHQ_MEASUREMENT_DEF">
-
- <!-- === required columns === -->
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
- <column name="NAME" type="VARCHAR2" size="100" required="true"/>
-
- <!-- === optional columns === -->
- <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
- <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
- <column name="CATEGORY" type="SMALLINT"/>
- <column name="UNITS" type="SMALLINT"/>
- <column name="NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DISPLAY_TYPE" type="SMALLINT"/>
- <column name="DATA_TYPE" type="SMALLINT"/>
- <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
- <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
- <column name="DEFAULT_INTERVAL" type="LONG" />
- <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
- <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
- <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
-
- <column name="VERSION" type="INTEGER"/>
- <!-- for optimistic locking -->
-
- <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
- <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- <field ref="RAW_NUMERIC_TYPE"/>
- </index>
- <index name="RHQ_METRIC_DEF_NT_IDX">
- <field ref="NUMERIC_TYPE"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_SCHED">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="ENABLED" type="BOOLEAN" default="false"/>
- <column name="MTIME" type="LONG" />
- <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
- <column name="VERSION" type="INTEGER" />
- <column name="COLL_INTERVAL" type="LONG" />
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
- <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
- <field ref="RESOURCE_ID"/>
- <field ref="DEFINITION"/>
- </index>
- <index name="RHQ_MEAS_SCHED_RESID_IDX">
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_BLINE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
-
- <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
- <column name="BL_MIN" type="DOUBLE" required="true"/>
- <column name="BL_MAX" type="DOUBLE" required="true"/>
- <column name="BL_MEAN" type="DOUBLE" required="true"/>
- <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
- <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
- <field ref="BL_COMPUTE_TIME"/>
- </index>
- <index name="RHQ_MEAS_BASELINE_SID_IDX">
- <field ref="SCHEDULE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true"
- tablespace="DEFAULT" storage-options="freelists 20">
-
- <column name="TIME_STAMP" required="true" type="LONG"/>
- <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
- <column name="VALUE" required="false" type="DOUBLE"/>
- <column name="MINVALUE" required="false" type="DOUBLE"/>
- <column name="MAXVALUE" required="false" type="DOUBLE"/>
-
- <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
-
- <index name="RHQ_MEAS_DATA_1D_TIME_IDX">
- <field ref="TIME_STAMP" />
- </index>
- </table>
-
-
- <table name="RHQ_MEASUREMENT_DATA_TRAIT">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER" />
- <column name="VALUE" type="VARCHAR2" size="4000" />
- <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_KEY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
- <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
- <field ref="SCHEDULE_ID"/>
- <field ref="CALL_DESTINATION"/>
- </index>
- </table>
-
-
- <table name="RHQ_CALLTIME_DATA_VALUE">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
- <column name="BEGIN_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="true"/>
- <column name="MINIMUM" type="DOUBLE" required="true"/>
- <column name="MAXIMUM" type="DOUBLE" required="true"/>
- <column name="TOTAL" type="DOUBLE" required="true"/>
- <column name="COUNT" type="LONG" required="true"/>
- <index name="RHQ_CT_DA_VA_END_TIM_IDX">
- <field ref="END_TIME"/>
- </index>
- </table>
-
-
- <table name="RHQ_AVAILABILITY">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
- <column name="START_TIME" type="LONG" required="true" />
- <column name="END_TIME" type="LONG" required="false" />
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_AVAIL_RESOURCE_START_IDX">
- <field ref="RESOURCE_ID"/>
- <field ref="START_TIME"/>
- </index>
- <!-- only one null row can exist for any resource -->
- <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
- <field ref="RESOURCE_ID"/>
- <field ref="END_TIME" />
- </index>
- </table>
-
- <table name="RHQ_RESOURCE_AVAIL">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
- <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
- <index name="RHQ_RESOURCE_AVAIL_IDX">
- <field ref="RESOURCE_ID" />
- </index>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB">
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_MEASUREMENT_OOB_TMP">
- <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
- <column name="TIME_STAMP" type="LONG" required="true"/>
- <column name="OOB_FACTOR" type="INTEGER" required="true" />
- <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_NUMBERS">
- <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
- </table>
-
-
- <table name="RHQ_MEAS_DATA_NUM_R00">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R00_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R01">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R01_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R02">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R02_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R03">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R03_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R04">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R04_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R05">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R05_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R06">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R06_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R07">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R07_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R08">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R08_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R09">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R09_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R10">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R10_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R11">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R11_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R12">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R12_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R13">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R13_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
- <table name="RHQ_MEAS_DATA_NUM_R14">
- <column name="TIME_STAMP" type="LONG"/>
- <column name="SCHEDULE_ID" type="INTEGER"/>
- <column name="VALUE" type="DOUBLE"/>
- <index name="RHQ_MEAS_DATA_R14_TS_IDX">
- <field ref="TIME_STAMP"/>
- </index>
- <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
- <primaryKey>
- <field ref="SCHEDULE_ID"/>
- <field ref="TIME_STAMP"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: measurement-schema.xml -->
-<!-- BEGIN: content-schema.xml -->
-
-
- <table name="RHQ_ARCHITECTURE">
- <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="50" type="VARCHAR2" required="true"/>
- <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_REPO_GROUP_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_GROUP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- <column name="REPO_GROUP_TYPE_ID" type="INTEGER" references="RHQ_REPO_GROUP_TYPE" required="true"/>
-
- <index name="RHQ_REPO_GROUP_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="REPO_GROUP_TYPE_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_CONTENT_SOURCE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
- <!-- we might want this as part of natural key -->
- <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
-
- <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <!-- <field ref="PLUGIN_NAME"/> -->
- </index>
- </table>
-
- <table name="RHQ_CONTENT_SOURCE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
- <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
- <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
-
- <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="CONTENT_SOURCE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_REPO">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
- <column name="IS_CANDIDATE" type="BOOLEAN" required="true"/>
- <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
- <column name="OWNER_ID" type="INTEGER" required="false" references="RHQ_SUBJECT" />
- <column name="IS_PRIVATE" type="BOOLEAN" required="true" />
-
- <index name="RHQ_REPO_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_RELATION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
-
- <table name="RHQ_REPO_RELATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RELATED_REPO_ID" type="INTEGER" references="RHQ_REPO" required="true"/>
- <column name="REPO_RELATION_TYPE_ID" type="INTEGER" references="RHQ_REPO_RELATION_TYPE" required="true"/>
- </table>
-
-
-
- <table name="RHQ_PACKAGE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
- <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
- <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
- <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
-
- <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
- <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
- <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
-
- <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="RESOURCE_TYPE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
-
- <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
-
- <index name="RHQ_PACKAGE_IDX" unique="true">
- <field ref="NAME"/>
- <field ref="PACKAGE_TYPE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PACKAGE_BITS">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BITS" type="LARGEOBJECT" required="false"/>
- </table>
-
- <table name="RHQ_PACKAGE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
- <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
- <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
- <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="FILE_SIZE" type="LONG" required="false"/>
- <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
- <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
- <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
- <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
- <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
- <column name="METADATA" type="BLOB" required="false"/>
-
- <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
- <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
- <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
-
- <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
- <field ref="PACKAGE_ID"/>
- <field ref="VERSION"/>
- <field ref="ARCHITECTURE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_CONTENT_REQ">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
- <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
- </table>
-
- <table name="RHQ_INSTALLED_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="INSTALLATION_TIME" type="LONG" required="false"/>
-
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
- </table>
-
- <table name="RHQ_INSTALLED_PKG_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
-
- <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
- <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
- <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
- </table>
-
- <table name="RHQ_CONTENT_SRC_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- </table>
-
- <table name="RHQ_REPO_SYNC">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
- <column name="START_TIME" type="LONG" required="true"/>
- <column name="END_TIME" type="LONG" required="false"/>
- <column name="RESULTS" type="LONGVARCHAR" required="false"/>
- <column name="PERCENT_COMPLETE" type="LONG" required="false"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- </table>
-
-
- <table name="RHQ_PACKAGE_INST_STEP">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
- <column name="STEP_ORDER" type="INTEGER" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
- <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
- <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
-
- <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
- </table>
-
- <table name="RHQ_REPO_RESOURCE_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_CONTENT_SRC_MAP"> 1
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_GROUP_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_GROUP_ID" type="INTEGER" required="true" references="RHQ_REPO_GROUP"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_GROUP_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_GROUP_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_REPO_REPO_RELATION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="REPO_RELATION_ID" type="INTEGER" required="true" references="RHQ_REPO_RELATION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_REPO_RELATION_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="REPO_RELATION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
- <table name="RHQ_REPO_PKG_VERSION_MAP">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- <index name="RHQ_REPO_PKG_VER_MAP_IDX" unique="false">
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
-
- <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
- <primaryKey>
- <field ref="PACKAGE_VERSION_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_PKG_PRD_MAP">
- <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
-
- <constraint name="RHQ_PKG_PRD_KEY">
- <primaryKey>
- <field ref="PKG_ID"/>
- <field ref="PRD_ID"/>
- </primaryKey>
- </constraint>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
-
- </table>
-
- <table name="RHQ_DISTRIBUTION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_TYPE_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION_TYPE"/>
- <column name="LABEL" size="64" type="VARCHAR2" required="true"/>
- <column name="BASE_PATH" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_DISTRIBUTION_IDX" unique="true">
- <field ref="LABEL"/>
- <field ref="BASE_PATH"/>
- </index>
-
- </table>
-
- <table name="RHQ_REPO_DISTRIBUTION">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_DIST_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="DISTRIBUTION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-
- <table name="RHQ_DISTRIBUTION_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
- <column name="RELATIVE_FILENAME" size="256" type="VARCHAR2" required="true"/>
- <!--<column name="FILE_SIZE" type="NUMBER" required="true"/>-->
- <column name="MD5SUM" size="64" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
- <!--<column name="CTIME" type="LONG" required="true"/>-->
-
- <index name="RHQ_DISTRIBUTION_FILE_IDX" unique="true">
- <field ref="DISTRIBUTION_ID"/>
- <field ref="RELATIVE_FILENAME"/>
- </index>
- </table>
-
-
-
-
- <table name="RHQ_ADVISORY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY" size="64" type="VARCHAR2" required="true"/>
- <column name="ADVISORY_TYPE" size="64" type="VARCHAR2" required="true" />
- <column name="ADVISORY_REL" size="64" type="VARCHAR2" required="false"/>
- <column name="ADVISORY_NAME" size="64" type="VARCHAR2" required="false"/>
- <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SYNOPSIS" size="4000" type="VARCHAR2" required="true"/>
- <column name="TOPIC" size="4000" type="VARCHAR2" required="false"/>
- <column name="SOLUTION" size="4000" type="VARCHAR2" required="false"/>
- <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/>
- <column name="ISSUE_DATE" type="LONG" required="false"/>
- <column name="UPDATE_DATE" type="LONG" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_NAME_UQ" unique="true">
- <field ref="ADVISORY_NAME"/>
- </index>
-
- <index name="RHQ_ADVISORY_UQ" unique="true">
- <field ref="ADVISORY"/>
- </index>
-
- <index name="RHQ_ADVISORY_UDATE_IDX" unique="false">
- <field ref="UPDATE_DATE"/>
- </index>
- </table>
-
- <table name="RHQ_ADVISORY_PACKAGE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_PKG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </index>
- </table>
-
- <table name="RHQ_CVE">
- <column name="ID" default="sequence-only" initial="101" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="64" type="VARCHAR2" required="true"/>
- </table>
-
- <table name="RHQ_ADVISORY_CVE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="CVE_ID" type="INTEGER" required="true" references="RHQ_CVE"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_CVE_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="CVE_ID"/>
- </index>
-
- </table>
-
- <table name="RHQ_ADVISORY_BUGLIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="BUG_ID" size="256" type="VARCHAR2" required="true"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <index name="RHQ_ADVISORY_BUG_IDX" unique="true">
- <field ref="ADVISORY_ID"/>
- <field ref="BUG_ID"/>
- </index>
- </table>
-
-
- <table name="RHQ_REPO_ADVISORY">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
- <column name="LAST_MODIFIED" type="LONG" required="true"/>
-
- <constraint name="RHQ_REPO_ADV_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="ADVISORY_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_TYPE is things like "Cobbler profile" or "file-based bundle" or "puppet recipe" -->
- <table name="RHQ_BUNDLE_TYPE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
- <table name="RHQ_BUNDLE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/>
- <column name="PACKAGE_TYPE_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_TYPE"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_UNIQUE" unique="true">
- <field ref="BUNDLE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- BUNDLE_VERSION represents an actual piece of content that needs to be installed somewhere -->
- <table name="RHQ_BUNDLE_VERSION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
- <column name="VERSION_ORDER" type="INTEGER" required="true"/>
- <column name="ACTION" type="CLOB" required="true"/>
- <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="NAME"/>
- <field ref="VERSION"/>
- </index>
- </table>
-
- <!-- Many-to-many table that links many repos to a particular bundle version. destination platforms -->
- <!-- would be required to have associations to the specified repos (to access required content -->
- <table name="RHQ_BUNDLE_VERSION_REPO">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
-
- <constraint name="RHQ_BUNDLE_VERSION_REPO_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="REPO_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- BUNDLE_FILE represents a file that is associated with (possibly bundled inside) a bundle version -->
- <table name="RHQ_BUNDLE_FILE">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- </table>
-
- <!-- A logical destination for a bundle deployment. Defines the platforms and directory on those targets. -->
- <table name="RHQ_BUNDLE_DESTINATION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
- <column name="DEPLOY_DIR" size="256" type="VARCHAR2" required="true"/>
- <column name="DEST_BASE_DIR_NAME" size="200" type="VARCHAR2" required="true"/>
-
- <!-- This index is for constraint, not performance -->
- <index name="RHQ_BUNDLE_DESTINATION_UNIQUE" unique="true">
- <field ref="BUNDLE_ID"/>
- <field ref="GROUP_ID"/>
- <field ref="DEPLOY_DIR"/>
- </index>
- </table>
-
- <!-- An actual deployment of a bundle version to a destination, with a specific config. Bundle deployments
- can differ only on ctime, which is assumed to be different -->
- <table name="RHQ_BUNDLE_DEPLOYMENT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="255"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="IS_LIVE" type="BOOLEAN" required="true"/>
- <column name="REPLACED_BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_DEPLOYMENT"/>
- </table>
-
- <!-- Represents a bundle version that is deployed on a platform resource -->
- <table name="RHQ_BUNDLE_RES_DEPLOY">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT" />
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE" />
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_BUNDLE_RES_DEPLOY_IDX" unique="true">
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="RESOURCE_ID"/>
- </index>
- </table>
-
- <table name="RHQ_BUNDLE_RES_DEP_HIST">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="BUNDLE_RES_DEPLOY_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_RES_DEPLOY" />
- <column name="SUBJECT_NAME" required="false" size="255" type="VARCHAR2"/>
- <column name="AUDIT_TIME" required="true" type="LONG"/>
- <column name="ACTION" required="true" size="128" type="VARCHAR2"/>
- <column name="INFO" required="true" size="512" type="VARCHAR2"/>
- <column name="CATEGORY" required="false" size="32" type="VARCHAR2"/>
- <column name="STATUS" required="true" type="VARCHAR2" size="16"/>
- <column name="MESSAGE" required="false" type="LONGVARCHAR"/>
- <column name="ATTACHMENT" required="false" type="LONGVARCHAR"/>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_MAP">
- <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_VERSION_MAP">
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_VER_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_VERSION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEPLOY_MAP">
- <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DEP_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DEPLOYMENT_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_TAGGING_BUNDLE_DEST_MAP">
- <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
- <constraint name="RHQ_TAGGING_BUNDLE_DES_MAP_KEY">
- <primaryKey>
- <field ref="BUNDLE_DESTINATION_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- Drift Management Tables -->
- <table name="RHQ_DRIFT_DEF_TEMPLATE">
- <column name="ID" default="sequence-only" initial="1001" primarykey="true" required="true" type="INTEGER"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="NAME" type="VARCHAR2" size="128" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <!-- true if defined by user, false if provided by plugin -->
- <column name="IS_USER_DEFINED" type="BOOLEAN" required="true"/>
- <!--
- Change sets are managed by the drift server plugins; therefore, we cannot maintain
- a FK constraint on the change set id. And the type cannot be integer because
- other back ends like MongoDB use other types that are basically variants of a
- UUID
-
- jsanda
- -->
- <column name="DRIFT_CHANGE_SET_ID" type="VARCHAR2" size="64" required="false"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <index name="RHQ_DRIFT_DEF_TEMPLATE_UNIQUE" unique="true">
- <field ref="RESOURCE_TYPE_ID"/>
- <field ref="NAME"/>
- </index>
- </table>
-
- <!-- Content of a file being managed for drift. Used for diff and/or remediation -->
- <table name="RHQ_DRIFT_FILE">
- <column name="HASH_ID" type="VARCHAR2" size="64" primarykey="true" required="true"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="DATA" type="LARGEOBJECT" required="false"/>
- <column name="DATA_SIZE" type="LONG" required="false"/>
- <column name="STATUS" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single drift definition defining file tracking
- Note: A resource or group (todo: group, other?) can have zero or more drift configurations.
- Note: The name, interval and is_enabled values are also stored withing the referenced config.
- This allows us to use the config editor to manipulate all fields.
- Note: Name is read-only
- Note: Interval unit is millis
- -->
- <table name="RHQ_DRIFT_DEFINITION">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEF_TEMPLATE_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEF_TEMPLATE"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="NAME" type="VARCHAR2" size="512" required="true"/>
- <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
- <column name="INTERVAL" type="LONG" required="true"/>
- <column name="IS_ENABLED" type="BOOLEAN" required="true"/>
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- <column name="IS_PINNED" type="BOOLEAN" required="true"/>
- <column name="IS_ATTACHED" type="BOOLEAN" required="true"/>
- <column name="COMPLIANCE_STATUS" type="INTEGER" required="true"/>
- </table>
-
- <!-- A set of drift records (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- </table>
-
- <!-- A drift change-set report for a resource (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT_CHANGE_SET">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="CTIME" type="LONG" required="true"/>
- <!-- Version 0 is initial change-set -->
- <column name="VERSION" type="INTEGER" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
- <column name="DRIFT_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEFINITION"/>
- <!-- the drift handling mode at changeset creation time -->
- <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
- </table>
-
- <!-- A single occurence of drift for a resource (note, this is for the JPA server plugin impl only) -->
- <table name="RHQ_DRIFT">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
- <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
- <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/>
- <!-- the file path not including the base directory -->
- <column name="PATH" type="VARCHAR2" size="1024" required="true"/>
- <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search.
- this field can be considered transient for serialization purposes -->
- <column name="PATH_DIRECTORY" type="VARCHAR2" size="1024" required="true"/>
- <column name="OLD_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- <column name="NEW_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
- </table>
-
-
-<!-- END: content-schema.xml -->
-<!-- BEGIN: resource-request-schema.xml -->
-
-
- <table name="RHQ_CREATE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
- <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
- <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
- </table>
-
- <table name="RHQ_DELETE_RES_HIST">
- <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
- <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
- <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
- <column name="CTIME" type="LONG" required="true"/>
- <column name="MTIME" type="LONG" required="true"/>
- <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- </table>
-
-<!-- END: resource-request-schema.xml -->
-<!-- BEGIN: jms-schema.xml -->
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem -->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-
-
- <table name="JMS_MESSAGES">
- <column name="MESSAGEID" required="true" type="INTEGER" />
- <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
- <column name="TXID" required="false" type="INTEGER" />
- <column name="TXOP" required="false" type="CHAR" size="1" />
- <column name="MESSAGEBLOB" required="false" type="BLOB" />
-
- <constraint name="JMS_MESSAGES_PKEY">
- <primaryKey>
- <field ref="MESSAGEID"/>
- <field ref="DESTINATION"/>
- </primaryKey>
- </constraint>
-
- <index name="JMS_MESSAGES_TXOP_TXID">
- <field ref="TXOP"/>
- <field ref="TXID"/>
- </index>
- <index name="JMS_MESSAGES_DESTINATION">
- <field ref="DESTINATION"/>
- </index>
- </table>
-
- <table name="JMS_TRANSACTIONS">
- <column name="TXID" required="true" type="INTEGER" primarykey="true" />
- </table>
-
- <table name="JMS_USERS">
- <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
- <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
- <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
- </table>
-
- <table name="JMS_ROLES">
- <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
- <column name="USERID" required="true" type="VARCHAR2" size="32" />
-
- <constraint name="JMS_ROLES_PKEY">
- <primaryKey>
- <field ref="USERID"/>
- <field ref="ROLEID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="JMS_SUBSCRIPTIONS">
- <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
- <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
- <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
- <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
-
- <constraint name="JMS_SUBSCRIPTIONS_PKEY">
- <primaryKey>
- <field ref="CLIENTID"/>
- <field ref="SUBNAME"/>
- </primaryKey>
- </constraint>
- </table>
-
-<!-- END: jms-schema.xml -->
-<!-- BEGIN: obsolete-schema.xml -->
-
-
- <!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in this file! -->
- <!-- NOTE: So, put the table you want dropped first at the bottom, and so on... -->
-
-
- <!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
-
- <table name="RHQ_DRIFT_TEMPLATE_MAP">
- <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
- <column name="CONFIG_TEMPLATE_ID" type="INTEGER" required="true" references="RHQ_CONFIG_TEMPLATE"/>
- </table>
-
- <table name="RHQ_BUNDLE_CONFIG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
- <!-- this probably needs a DTYPE discriminator so we know if its a bundle or a specific bundle version -->
- <column name="BUNDLE_VERSION_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_VERSION"/>
- <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/>
- </table>
-
- <table name="RHQ_CHANNEL" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- <column name="CREATION_TIME" type="LONG" required="true"/>
- <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
-
- <index name="RHQ_CHANNEL_IDX" unique="true">
- <field ref="NAME"/>
- </index>
- </table>
-
- <table name="RHQ_CHANNEL_RESOURCE_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="RESOURCE_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_CONTENT_SRC_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="CONTENT_SRC_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="RHQ_CHANNEL_PKG_VERSION_MAP" obsolete="true">
- <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
- <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
- <column name="CTIME" type="LONG" required="true"/>
-
- <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
- <primaryKey>
- <field ref="CHANNEL_ID"/>
- <field ref="PACKAGE_VERSION_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <!-- !!! REMOVED FROM MEASUREMENT-SCHEMA !!!! -->
-
- <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
- <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
- <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
- <column name="OCCURRED" type="LONG" required="true"/>
- <column name="DIFF" type="DOUBLE" required="true"/>
-
- <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
- <field ref="SCHEDULE_ID" />
- <field ref="OCCURRED" />
- </index>
- </table>
-
-
- <table name="RHQ_TAG" obsolete="true">
- <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
- <column name="NAME" size="200" type="VARCHAR2" required="true"/>
- <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
- </table>
-
- <table name="RHQ_REPO_TAG_MAP" obsolete="true">
- <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
- <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAG"/>
-
- <constraint name="RHQ_REPO_TAG_MAP_KEY">
- <primaryKey>
- <field ref="REPO_ID"/>
- <field ref="TAG_ID"/>
- </primaryKey>
- </constraint>
- </table>
-
-
-<!-- END: obsolete-schema.xml -->
-</dbsetup>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
deleted file mode 100644
index f329ee6..0000000
--- a/modules/enterprise/server/container/pom.xml
+++ /dev/null
@@ -1,443 +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-parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server-container</artifactId>
- <packaging>pom</packaging>
-
- <name>RHQ Enterprise Server Container</name>
- <description>The full RHQ container build, including the JBossAS server and all config/deploy files</description>
-
- <properties>
- <!-- dependency versions -->
- <jboss-faces.version>4.2.3.GA</jboss-faces.version>
- <rhq.webappsReloadable>false</rhq.webappsReloadable>
- </properties>
-
- <dependencies>
-
- <!-- Internal Deps -->
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>safe-invoker</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- 3rd Party Deps -->
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-dist</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups-all</artifactId>
- <version>2.2.9.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- </dependency>
-
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.7.3</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>rhq-server-${project.version}</finalName>
- <outputDirectory>target/${project.build.finalName}</outputDirectory>
-
- <resources>
-
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
-
- <resource>
- <directory>src/main/bin-resources</directory>
- <filtering>false</filtering>
- </resource>
-
- </resources>
-
- <plugins>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>move-src</id>
- <phase>process-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>prepare-container</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <echo>settings.localRepository=${settings.localRepository}</echo>
- <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo>
- <ant antfile="src/main/scripts/rhq-container.build.xml" target="prepare-container">
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="project.build.outputDirectory" value="${project.build.outputDirectory}" />
- <property name="project.version" value="${project.version}" />
- <property name="dev.profile.active" value="${dev.profile.active}" />
- <property name="developer" value="${developer}" />
- <property name="rhq.earName" value="${rhq.earName}" />
-
- <!-- dependency versions -->
- <property name="rhq.version" value="${project.version}" />
- <property name="jboss.version" value="${jboss.version}" />
- <property name="ojdbc6.version" value="${ojdbc6.version}" />
- <property name="postgresql.version" value="${postgresql.version}" />
- <property name="h2.version" value="${h2.version}" />
- <property name="jboss-javassist.version" value="${javassist.version}" />
- <property name="jtds.version" value="${jtds.version}" />
- <property name="jsf-api.version" value="${jsf-api.version}" />
- <property name="jsf-impl.version" value="${jsf-impl.version}" />
- <property name="hibernate.version" value="${hibernate.version}" />
- <property name="quartz.version" value="${quartz.version}" />
- <property name="xercesImpl.version" value="${xercesImpl.version}" />
-
- <!-- dev DB settings (used to init rhq-server.properties if dev profile is active or developer prop is set) -->
- <property name="rhq.dev.ds.connection-url" value="${rhq.dev.ds.connection-url}" />
- <property name="rhq.dev.ds.driver-class" value="${rhq.dev.ds.driver-class}" />
- <property name="rhq.dev.ds.xa-datasource-class" value="${rhq.dev.ds.xa-datasource-class}" />
- <property name="rhq.dev.ds.user-name" value="${rhq.dev.ds.user-name}" />
- <property name="rhq.dev.ds.password.encrypted" value="${rhq.dev.ds.password.encrypted}" />
- <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" />
- <property name="rhq.dev.ds.server-name" value="${rhq.dev.ds.server-name}" />
- <property name="rhq.dev.ds.port" value="${rhq.dev.ds.port}" />
- <property name="rhq.dev.ds.db-name" value="${rhq.dev.ds.db-name}" />
- <property name="rhq.dev.ds.hibernate-dialect" value="${rhq.dev.ds.hibernate-dialect}" />
- <property name="rhq.dev.quartz.driverDelegateClass" value="${rhq.dev.quartz.driverDelegateClass}" />
- <property name="rhq.dev.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" />
- <property name="rhq.dev.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" />
-
- <!-- default server settings used by installer -->
- <property name="rhq.server.http.port" value="${rhq.server.http.port}" />
- <property name="rhq.server.https.port" value="${rhq.server.https.port}" />
-
- <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}" />
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>prepare-release</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <echo>Preparing the release at ${project.build.outputDirectory}...</echo>
- <ant antfile="src/main/scripts/rhq-container.build.xml" target="prepare-release">
- <property name="project.build.outputDirectory" value="${project.build.outputDirectory}" />
-
- <!-- the 'dev.profile.active' prop is set to true by the root POM if the dev profile is active; -->
- <!-- if 'dev.profile.active' != "true", the container will be made packageable -->
- <!-- (i.e. running the installer first will be required); -->
- <!-- if 'dev.profile.active' == "true", the ear, datasource and JMS backend will be predeployed; -->
- <!-- developers will normally want to do this to avoid having to run the installer -->
- <!-- [mazz] added the ability to say -Ddeveloper to also predeploy, even if not in dev profile -->
- <property name="dev.profile.active" value="${dev.profile.active}" />
- <property name="developer" value="${developer}" />
- <property name="rhq.earName" value="${rhq.earName}" />
-
- <!-- dev/test DB type (needed to init rhq-ds.xml) -->
- <property name="rhq.test.ds.type-mapping" value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" />
- <property name="rhq.server.enable.web.services" value="${rhq.server.enable.ws}" />
- </ant>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archiverConfig>
- <!-- permissions for archiver configuration are in decimal (not octal) -->
- <!-- 493 (decimal) = 755 (octal)-->
- <defaultDirectoryMode>493</defaultDirectoryMode>
- </archiverConfig>
- <descriptors>
- <descriptor>src/main/scripts/rhq-container.assembly.xml</descriptor>
- </descriptors>
- <finalName>${project.build.finalName}</finalName>
- </configuration>
- <executions>
- <execution>
- <id>assemble-server-container-zip</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!--
- We skip the API checking in this module, because there is no new
- code to check. This module merely composes classes from other modules
- which have already been checked.
- Also, enabling the API checks in this module causes some weird problems
- for the animal sniffer, because it most probably cannot figure out
- the full set of dependencies for classes of the web apps contained in the
- EAR were creating here.
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
-
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
- <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
-
- <rhq.webappsReloadable>true</rhq.webappsReloadable>
- </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.containerDir}" />
- <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>
- <!-- Make sure shell scripts are readable and executable. -->
- <chmod perm="ug+x" verbose="true">
- <fileset dir="${deployment.dir}/bin" includes="*.sh" />
- <fileset dir="${deployment.dir}/jbossas/bin" includes="*.sh" />
- </chmod>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.dir" location="${rhq.containerDir}" />
- <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
- <delete dir="${deployment.dir}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </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>1.9.4.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>cobertura-merge</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <target>
- <!-- prepare directory structure for cobertura-->
- <mkdir dir="target/cobertura" />
- <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
- <!-- instrument all classes in target/classes directory -->
- <cobertura-merge datafile="${project.build.directory}/cobertura/cobertura.ser">
- <fileset dir="../../../../">
- <include name="**/cobertura.ser" />
- </fileset>
- </cobertura-merge>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <executions>
- <execution>
- <phase>post-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- import java.util.regex.Pattern
- import java.util.regex.Matcher
-
- def repClos
- def list = new ArrayList()
-
- Pattern sourceCodeFolder = Pattern.compile(".*/src/main/java")
- Pattern sourceCodeFile = Pattern.compile('.*/src/main/java/(.*.java)')
-
- list.add("--format")
- list.add("xml")
- list.add("--datafile")
- list.add("${project.build.directory}/cobertura/cobertura.ser")
- list.add("--destination")
- list.add("${project.build.directory}/site/cobertura")
-
- repClosFile = {
- Matcher matcher = sourceCodeFile.matcher(it.canonicalPath)
- if (matcher.matches()){
- list.add(matcher[0][1])
- }
-
- if (it.isDirectory()){
- it.eachFile(repClosFile)
- }
- }
-
- repClosDir = {
- Matcher matcher = sourceCodeFolder.matcher(it.canonicalPath)
- if (matcher.matches()){
- list.add("--basedir")
- list.add(it.canonicalPath)
- it.eachFile(repClosFile)
- }
- it.eachDir(repClosDir);
- }
-
- def ear = new File("${project.build.directory}/../../../../")
- repClosDir(ear)
-
- net.sourceforge.cobertura.reporting.Main.main((String[]) list)
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.bat b/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.bat
deleted file mode 100644
index 147e602..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.bat
+++ /dev/null
@@ -1,121 +0,0 @@
-@echo off
-
-rem ===========================================================================
-rem RHQ Server Windows Generate db password script
-rem
-rem This file is used to execute the generate a new encrypted db password.
-rem
-rem This script is customizable by setting the following environment variables:
-rem
-rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug
-rem messages.
-rem If not set or set to "false", debug is turned off.
-rem
-rem RHQ_SERVER_HOME - Defines where the Server's home install directory is.
-rem If not defined, it will be assumed to be the parent
-rem directory of the directory where this script lives.
-rem
-rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will
-rem use. This will be ignored if
-rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
-rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
-rem not set, the Server's embedded JRE will be used.
-rem
-rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-rem executable to use. If this is set,
-rem RHQ_SERVER_JAVA_HOME is ignored.
-rem If this is not set, then
-rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe
-rem is used. If this and
-rem RHQ_SERVER_JAVA_HOME are not set, the
-rem Server's embedded JRE will be used.
-rem
-rem
-rem Note that you cannot define custom Java VM parameters or command line
-rem arguments to pass to the RHQ Server run.sh. If you wish to pass in
-rem specific arguments, modify the rhq-server-wrapper.conf file.
-rem
-rem If the embedded JRE is to be used but is not available, the fallback
-rem JRE to be used will be determined by the JAVA_HOME environment variable.
-rem
-rem ===========================================================================
-
-setlocal
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_SERVER_DEBUG%" == "false" (
- set RHQ_SERVER_DEBUG=
-)
-
-rem ----------------------------------------------------------------------
-rem Ensure password parameter is present
-rem ----------------------------------------------------------------------
-
-if /i "%1"=="" (
- echo Usage: %0 { plainTextPassword }
- goto :done
-)
-
-rem ----------------------------------------------------------------------
-rem Change directory so the current directory is the Server home.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_BIN_DIR_PATH=%~dp0
-
-if not defined RHQ_SERVER_HOME (
- cd "%RHQ_SERVER_BIN_DIR_PATH%\.."
-) else (
- cd "%RHQ_SERVER_HOME%" || (
- echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME%
- exit /B 1
- )
-)
-
-set RHQ_SERVER_HOME=%CD%
-
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME%
-
-rem ----------------------------------------------------------------------
-rem Find the Java executable and verify we have a VM available.
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre
-)
-
-if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe
-
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME%
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH%
-
-if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" (
- echo There is no JVM available.
- echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately.
- exit /B 1
-)
-
-set _JB_DIR=%RHQ_SERVER_HOME%\jbossas
-"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" -cp %_JB_DIR%\lib\jboss-common.jar;%_JB_DIR%\lib\jboss-jmx.jar;%_JB_DIR%\server\default\lib\jbosssx.jar;%_JB_DIR%\server\default\lib\jboss-jca.jar org.jboss.resource.security.SecureIdentityLoginModule %1
-
-
-goto :done
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre
-if defined RHQ_SERVER_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_SERVER_JAVA_HOME%" (
- if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_SERVER_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that exits this script normally
-rem ----------------------------------------------------------------------
-
-:done
-endlocal
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh b/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh
deleted file mode 100755
index 1d464d7..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-# =============================================================================
-# RHQ Server UNIX Generate db password script
-#
-# This file is used to execute the generate a new encrypted db password.
-#
-# This script is customizable by setting the following environment variables:
-#
-#
-# RHQ_SERVER_HOME - Defines where the server's home install directory is.
-# If not defined, it will be assumed to be the parent
-# directory of the directory where this script lives.
-#
-# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will
-# use. This will be ignored if
-# RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
-# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
-# not set, the Server's embedded JRE will be used.
-#
-# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-# executable to use. If this is set,
-# RHQ_SERVER_JAVA_HOME is ignored.
-# If this is not set, then
-# $RHQ_SERVER_JAVA_HOME/bin/java
-# is used. If this and
-# RHQ_SERVER_JAVA_HOME are not set, the
-# Server's embedded JRE will be used.
-#
-# If the embedded JRE is to be used but is not available, the fallback
-# JRE to be used will be determined by the JAVA_HOME environment variable.
-#
-# =============================================================================
-
-# ----------------------------------------------------------------------
-# Environment variables you can set to customize the launch of the RHQ Server.
-# ----------------------------------------------------------------------
-
-# RHQ_SERVER_HOME=/path/to/server/home
-# RHQ_SERVER_DEBUG=true
-# JAVA_HOME=/path/to/java/installation
-# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable
-# ----------------------------------------------------------------------
-# Make sure we unset any lingering JBossAS environment variables that
-# were set in the user's environment. This might happen if the user
-# has an external JBossAS configured.
-# ----------------------------------------------------------------------
-
-unset JBOSS_HOME
-unset RUN_CONF
-unset JAVAC_JAR
-unset JBOSS_CLASSPATH
-
-# ----------------------------------------------------------------------
-# Dumps a message iff debug mode is enabled
-# ----------------------------------------------------------------------
-
-debug_msg ()
-{
- # if debug variable is set, it is assumed to be on, unless its value is false
- if [ "x$RHQ_SERVER_DEBUG" != "x" ]; then
- if [ "$RHQ_SERVER_DEBUG" != "false" ]; then
- echo $1
- fi
- fi
-}
-
-
-# ----------------------------------------------------------------------
-# Determine what specific platform we are running on.
-# Set some platform-specific variables.
-# ----------------------------------------------------------------------
-
-case "`uname`" in
- CYGWIN*) _CYGWIN=true
- ;;
- Darwin*) _DARWIN=true
- ;;
- SunOS*) _SOLARIS=true
- ;;
- AIX*) _AIX=true
- ;;
-esac
-
-# ----------------------------------------------------------------------
-# Determine the RHQ Server installation directory.
-# If RHQ_SERVER_HOME is not defined, we will assume we are running
-# directly from the server installation's bin directory.
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_HOME" ]; then
- _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"`
- RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/..
-else
- if [ ! -d "$RHQ_SERVER_HOME" ]; then
- echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory"
- echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
- exit 1
- fi
-fi
-
-cd "$RHQ_SERVER_HOME"
-RHQ_SERVER_HOME=`pwd`
-
-debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
-
-if [ ! -f "${RHQ_SERVER_HOME}/jbossas/bin/run.jar" ]; then
- echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ Server"
- echo "Missing ${RHQ_SERVER_HOME}/jbossas/bin/run.jar"
- exit 1
-fi
-
-# ----------------------------------------------------------------------
-# if we are on a Mac and JAVA_HOME is not set, then set it to /usr
-# as this is the default location.
-# ----------------------------------------------------------------------
-if [ -z "$JAVA_HOME" ]; then
- if [ -n "$_DARWIN" ]; then
- debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr"
- JAVA_HOME=/usr
- fi
-fi
-
-
-# ----------------------------------------------------------------------
-# Find the Java executable and verify we have a VM available
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
- if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then
- RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
- debug_msg "Using the embedded JRE"
- if [ ! -d "$RHQ_SERVER_JAVA_HOME" ]; then
- debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
- RHQ_SERVER_JAVA_HOME="$JAVA_HOME"
- fi
- fi
- debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME"
- RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java"
-fi
-debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH"
-
-if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
- echo "There is no JVM available."
- echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately."
- exit 1
-fi
-
-# run.sh will use JAVA as the full java command
-JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH"
-export JAVA
-
-if [ $# -eq 0 ]
-then
- echo "Usage generate-db-password <password>"
- exit 1
-fi
-
-_JB_DIR=${RHQ_SERVER_HOME}/jbossas
-$JAVA -cp $_JB_DIR/lib/jboss-common.jar:$_JB_DIR/lib/jboss-jmx.jar:$_JB_DIR/server/default/lib/jbosssx.jar:$_JB_DIR/server/default/lib/jboss-jca.jar org.jboss.resource.security.SecureIdentityLoginModule $*
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server-console.bat b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server-console.bat
deleted file mode 100644
index 4f7b79d..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server-console.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd %~dp0
-rhq-server.bat console
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.bat b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.bat
deleted file mode 100644
index 2af300c..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.bat
+++ /dev/null
@@ -1,223 +0,0 @@
-@echo off
-
-rem ===========================================================================
-rem RHQ Server Windows Startup Script
-rem
-rem This file is used to install, start, stop and remove the RHQ Server Windows
-rem Service for the Windows platform. It can also be used to start the
-rem RHQ Server in a console window. The RHQ Server is actually wrapped
-rem by the Java Service Wrapper (JSW) and it is the JSW that is the actual
-rem executable that is registered as the Windows Service.
-rem
-rem This script is customizable by setting the following environment variables:
-rem
-rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug
-rem messages.
-rem If not set or set to "false", debug is turned off.
-rem
-rem RHQ_SERVER_HOME - Defines where the Server's home install directory is.
-rem If not defined, it will be assumed to be the parent
-rem directory of the directory where this script lives.
-rem
-rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will
-rem use. This will be ignored if
-rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
-rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
-rem not set, the Server's embedded JRE will be used.
-rem
-rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-rem executable to use. If this is set,
-rem RHQ_SERVER_JAVA_HOME is ignored.
-rem If this is not set, then
-rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe
-rem is used. If this and
-rem RHQ_SERVER_JAVA_HOME are not set, the
-rem Server's embedded JRE will be used.
-rem
-rem RHQ_SERVER_INSTANCE_NAME - The name of the Windows Service; it must
-rem conform to the Windows Service naming
-rem conventions. By default, this is the
-rem name "rhqserver-%COMPUTERNAME%"
-rem
-rem RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The full path to the location where
-rem the wrapper log file will go.
-rem
-rem RHQ_SERVER_RUN_AS - if defined, then when the Windows Service is
-rem installed, the value is the domain\username of the
-rem user that the Windows Service will run as
-rem
-rem RHQ_SERVER_RUN_AS_ME - if defined, then when the Windows Service is
-rem installed, the domain\username of the
-rem user that the Windows Service will run as will
-rem be the current user (.\%USERNAME%). This takes
-rem precedence over RHQ_SERVER_RUN_AS.
-rem
-rem Note that you cannot define custom Java VM parameters or command line
-rem arguments to pass to the RHQ Server run.sh. If you wish to pass in
-rem specific arguments, modify the rhq-server-wrapper.conf file.
-rem
-rem If the embedded JRE is to be used but is not available, the fallback
-rem JRE to be used will be determined by the JAVA_HOME environment variable.
-rem
-rem This script does not use the built-in JBossAS run.bat.
-rem ===========================================================================
-
-setlocal
-
-rem if debug variable is set, it is assumed to be on, unless its value is false
-if "%RHQ_SERVER_DEBUG%" == "false" (
- set RHQ_SERVER_DEBUG=
-)
-
-rem ----------------------------------------------------------------------
-rem Change directory so the current directory is the Server home.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_BIN_DIR_PATH=%~dp0
-
-if not defined RHQ_SERVER_HOME (
- cd "%RHQ_SERVER_BIN_DIR_PATH%\.."
-) else (
- cd "%RHQ_SERVER_HOME%" || (
- echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME%
- exit /B 1
- )
-)
-
-set RHQ_SERVER_HOME=%CD%
-
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME%
-
-rem ----------------------------------------------------------------------
-rem Find the Java executable and verify we have a VM available.
-rem ----------------------------------------------------------------------
-
-if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH (
- if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre
-)
-
-if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe
-
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME%
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH%
-
-if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" (
- echo There is no JVM available.
- echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately.
- exit /B 1
-)
-
-rem ----------------------------------------------------------------------
-rem Define the name used for the name of the Windows Service.
-rem If this is not defined, the name of the computer is used.
-rem ----------------------------------------------------------------------
-
-if "%RHQ_SERVER_INSTANCE_NAME%"=="" (
- set RHQ_SERVER_INSTANCE_NAME=rhqserver-%COMPUTERNAME%
-)
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTANCE_NAME: %RHQ_SERVER_INSTANCE_NAME%
-
-rem ----------------------------------------------------------------------
-rem Determine the wrapper directory.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\wrapper
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_DIR_PATH: %RHQ_SERVER_WRAPPER_DIR_PATH%
-
-rem ----------------------------------------------------------------------
-rem The Windows OS platform name is also the wrapper subdirectory name.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_OS_PLATFORM=windows-x86_32
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_OS_PLATFORM: %RHQ_SERVER_OS_PLATFORM%
-
-rem ----------------------------------------------------------------------
-rem Determine the wrapper executable that this script will run.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_WRAPPER_EXE_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\%RHQ_SERVER_OS_PLATFORM%\wrapper.exe
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_EXE_FILE_PATH: %RHQ_SERVER_WRAPPER_EXE_FILE_PATH%
-
-rem ----------------------------------------------------------------------
-rem Determine the Server wrapper configuration file.
-rem ----------------------------------------------------------------------
-
-set RHQ_SERVER_WRAPPER_CONF_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\rhq-server-wrapper.conf
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_CONF_FILE_PATH: %RHQ_SERVER_WRAPPER_CONF_FILE_PATH%
-
-rem ----------------------------------------------------------------------
-rem Create and configure the wrapper log directory.
-rem ----------------------------------------------------------------------
-
-if "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" == "" (
- if not exist "%RHQ_SERVER_HOME%\logs" (
- mkdir "%RHQ_SERVER_HOME%\logs"
- )
- set RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs
-)
-if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_LOG_DIR_PATH: %RHQ_SERVER_WRAPPER_LOG_DIR_PATH%
-
-rem ----------------------------------------------------------------------
-rem Determine what to do and do it.
-rem ----------------------------------------------------------------------
-
-rem Determine if there should be debug VM options passed into it.
-rem For some reason, this can't go inside another if statement.
-if defined RHQ_SERVER_DEBUG set _DEBUG_OPTS=wrapper.debug=true
-
-rem Determine what user the Windows Service will run as.
-if defined RHQ_SERVER_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_SERVER_RUN_AS%"
-if defined RHQ_SERVER_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%"
-
-if /i "%1"=="console" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS%
- goto done
-)
-
-if /i "%1"=="install" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS%
- goto done
-)
-
-if /i "%1"=="start" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%"
- goto done
-)
-
-if /i "%1"=="stop" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%"
- goto done
-)
-
-if /i "%1"=="remove" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%"
- goto done
-)
-
-if /i "%1"=="status" (
- "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%"
- goto done
-)
-
-echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console }
-goto :done
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that prepares to use the embedded JRE
-rem ----------------------------------------------------------------------
-
-:prepare_embedded_jre
-set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre
-if defined RHQ_SERVER_DEBUG echo Using the embedded JRE
-if not exist "%RHQ_SERVER_JAVA_HOME%" (
- if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME%
- set RHQ_SERVER_JAVA_HOME=%JAVA_HOME%
-)
-goto :eof
-
-rem ----------------------------------------------------------------------
-rem CALL subroutine that exits this script normally
-rem ----------------------------------------------------------------------
-
-:done
-endlocal
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.security-policy b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.security-policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.security-policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh
deleted file mode 100644
index f481201..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh
+++ /dev/null
@@ -1,491 +0,0 @@
-#!/bin/sh
-
-# chkconfig: 2345 92 26
-# description: Starts and stops the RHQ Server
-#
-# processname: java
-
-# =============================================================================
-# RHQ Server UNIX Startup Script
-#
-# This file is used to execute the RHQ Server on a UNIX platform as part of
-# the platform's bootup sequence or as a foreground console process.
-# Run this script without any command line options for the syntax help.
-#
-# This script is customizable by setting the following environment variables:
-#
-# Note that if this script is to be used as an init.d script, you must set
-# RHQ_SERVER_HOME so this script knows where to find the Server installation.
-#
-# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug
-# messages. If this is not defined or set to "false"
-# debug messages are not emitted.
-#
-# RHQ_SERVER_HOME - Defines where the server's home install directory is.
-# If not defined, it will be assumed to be the parent
-# directory of the directory where this script lives.
-#
-# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will
-# use. This will be ignored if
-# RHQ_SERVER_JAVA_EXE_FILE_PATH is set.
-# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are
-# not set, the Server's embedded JRE will be used.
-#
-# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java
-# executable to use. If this is set,
-# RHQ_SERVER_JAVA_HOME is ignored.
-# If this is not set, then
-# $RHQ_SERVER_JAVA_HOME/bin/java
-# is used. If this and
-# RHQ_SERVER_JAVA_HOME are not set, the
-# Server's embedded JRE will be used.
-#
-# RHQ_SERVER_JAVA_OPTS - Java VM command line options to be
-# passed into the Server's VM. If this is not defined
-# this script will pass in a default set of options.
-# If this is set, it completely overrides the
-# Server's defaults. If you only want to add options
-# to the Server's defaults, then you will want to
-# use RHQ_SERVER_ADDITIONAL_JAVA_OPTS instead.
-#
-# RHQ_SERVER_ADDITIONAL_JAVA_OPTS - additional Java VM command line options
-# to be passed into the Server's VM. This
-# is added to RHQ_SERVER_JAVA_OPTS; it
-# is mainly used to augment the Server's
-# default set of options. This can be
-# left unset if it is not needed.
-# Enable remote debugging
-#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n"
-# Enable JProfiler
-#JPROFILER_HOME="/opt/jprofiler6"
-#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="$RHQ_SERVER_ADDITIONAL_JAVA_OPTS -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:$JPROFILER_HOME/bin/agent.jar"
-#export PATH="$PATH:$JPROFILER_HOME/bin"
-#export LD_LIBRARY_PATH="$JPROFILER_HOME/bin/linux-x64"
-#
-# RHQ_SERVER_CMDLINE_OPTS - If this is defined, these are the command line
-# arguments that will be passed to the RHQ Server
-# JBossAS run.sh. If you only want to add options
-# to the Server's defaults, then you will want to
-# use RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS instead.
-#
-# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS - additional command line arguments to
-# be passed to the RHQ Server JBossAS
-# run.sh. This is added to
-# RHQ_SERVER_CMDLINE_OPTS; it is mainly
-# used to augment the Server's default
-# set of options. This can be left unset
-# if it is not needed.
-#
-# RHQ_SERVER_PIDFILE_DIR - a full path to a writable directory where this
-# script can write its pidfile to.
-# If not defined, this defaults to the Server's
-# bin directory.
-#
-# If the embedded JRE is to be used but is not available, the fallback
-# JRE to be used will be determined by the JAVA_HOME environment variable.
-#
-# This script calls run.sh when starting the underlying JBossAS server.
-# =============================================================================
-
-# ----------------------------------------------------------------------
-# Environment variables you can set to customize the launch of the RHQ Server.
-# ----------------------------------------------------------------------
-
-# RHQ_SERVER_HOME=/path/to/server/home
-# RHQ_SERVER_DEBUG=true
-# JAVA_HOME=/path/to/java/installation
-# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable
-# RHQ_SERVER_JAVA_OPTS=VM options
-# RHQ_SERVER_ADDITIONAL_JAVA_OPTS=additional VM options
-# RHQ_SERVER_CMDLINE_OPTS=run.sh options
-# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS=additional run.sh options
-
-# ----------------------------------------------------------------------
-# Make sure we unset any lingering JBossAS environment variables that
-# were set in the user's environment. This might happen if the user
-# has an external JBossAS configured.
-# ----------------------------------------------------------------------
-
-unset JBOSS_HOME
-unset RUN_CONF
-unset JAVAC_JAR
-unset JBOSS_CLASSPATH
-
-# ----------------------------------------------------------------------
-# Dumps a message iff debug mode is enabled
-# ----------------------------------------------------------------------
-
-debug_msg ()
-{
- # if debug variable is set, it is assumed to be on, unless its value is false
- if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
- echo $1
- fi
-}
-
-# ----------------------------------------------------------------------
-# Sets _SERVER_STATUS, _SERVER_RUNNING and _SERVER_PID based on the
-# status of the RHQ Server VM start script (run.sh).
-# Also sets _JVM_STATUS, _JVM_RUNNING and _JVM_PID based on the
-# status of the JBossAS Java Virtual Machine.
-# ----------------------------------------------------------------------
-
-check_status ()
-{
- if [ -f "$_SERVER_PIDFILE" ]; then
- _SERVER_PID=`cat "$_SERVER_PIDFILE"`
- if [ -n "$_SERVER_PID" ] && kill -0 $_SERVER_PID 2>/dev/null ; then
- _SERVER_STATUS="RHQ Server (pid $_SERVER_PID) is $1"
- _SERVER_RUNNING=1
- else
- _SERVER_STATUS="RHQ Server (pid $_SERVER_PID) is NOT running"
- _SERVER_RUNNING=0
- fi
- else
- _SERVER_STATUS="RHQ Server (no pid file) is NOT running"
- _SERVER_RUNNING=0
- fi
-
- if [ -f "$_JVM_PIDFILE" ]; then
- _JVM_PID=`cat "$_JVM_PIDFILE"`
- if [ -n "$_JVM_PID" ] && kill -0 $_JVM_PID 2>/dev/null ; then
- _JVM_STATUS="JBossAS Java VM child process (pid $_JVM_PID) is $1"
- _JVM_RUNNING=1
- else
- _JVM_STATUS="JBossAS Java VM child process (pid $_JVM_PID) is NOT running"
- _JVM_RUNNING=0
- fi
- else
- _JVM_STATUS="JBossAS Java VM child process (no pid file) is NOT running"
- _JVM_RUNNING=0
- fi
-}
-
-# ----------------------------------------------------------------------
-# Ensures that the PID files no longer exist
-# ----------------------------------------------------------------------
-
-remove_pid_files ()
-{
- if [ -f "$_SERVER_PIDFILE" ]; then
- rm -f "$_SERVER_PIDFILE"
- fi
- if [ -f "$_JVM_PIDFILE" ]; then
- rm -f "$_JVM_PIDFILE"
- fi
-}
-
-# ----------------------------------------------------------------------
-# Determine what specific platform we are running on.
-# Set some platform-specific variables.
-# ----------------------------------------------------------------------
-
-case "`uname`" in
- CYGWIN*) _CYGWIN=true
- ;;
- Linux*) _LINUX=true
- ;;
- Darwin*) _DARWIN=true
- ;;
- SunOS*) _SOLARIS=true
- ;;
- AIX*) _AIX=true
- ;;
-esac
-
-# ----------------------------------------------------------------------
-# Determine the RHQ Server installation directory.
-# If RHQ_SERVER_HOME is not defined, we will assume we are running
-# directly from the server installation's bin directory.
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_HOME" ]; then
- if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then
- # only certain platforms support the -e argument for readlink
- _READLINK_ARG="-e"
- fi
- _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"`
- RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/..
-else
- if [ ! -d "$RHQ_SERVER_HOME" ]; then
- echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory"
- echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
- exit 1
- fi
-fi
-
-cd "$RHQ_SERVER_HOME"
-RHQ_SERVER_HOME=`pwd`
-
-debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME"
-
-if [ ! -f "${RHQ_SERVER_HOME}/jbossas/bin/run.jar" ]; then
- echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ Server"
- echo "Missing ${RHQ_SERVER_HOME}/jbossas/bin/run.jar"
- exit 1
-fi
-
-# ----------------------------------------------------------------------
-# if we are on a Mac and JAVA_HOME is not set, then set it to /usr
-# as this is the default location.
-# ----------------------------------------------------------------------
-if [ -z "$JAVA_HOME" ]; then
- if [ -n "$_DARWIN" ]; then
- debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr"
- JAVA_HOME=/usr
- fi
-fi
-
-# create the logs directory
-_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs"
-if [ -n "$_CYGWIN" ]; then
- _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"`
-fi
-if [ ! -d "${_LOG_DIR_PATH}" ]; then
- mkdir "${_LOG_DIR_PATH}"
-fi
-
-# ----------------------------------------------------------------------
-# Find the Java executable and verify we have a VM available
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
- if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then
- RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre"
- if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then
- debug_msg "Using the embedded JRE"
- else
- debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME"
- RHQ_SERVER_JAVA_HOME="$JAVA_HOME"
- fi
- fi
- debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME"
- RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java"
-fi
-debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH"
-
-if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then
- echo "There is no JVM available."
- echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately."
- exit 1
-fi
-
-# run.sh will use JAVA as the full java command
-JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH"
-export JAVA
-
-# If we're using IBM Java, we need to copy xalan.jar into the AS lib/endorsed dir.
-if $JAVA -version 2>&1 | grep "IBM J9" >/dev/null 2>&1; then
- XALAN_JAR="${RHQ_SERVER_HOME}/etc/ibm/xalan.jar"
- INSTALLED_XALAN_JAR="${RHQ_SERVER_HOME}/jbossas/lib/endorsed/xalan.jar"
- if [ -f "$XALAN_JAR" ] && [ ! -f "$INSTALLED_XALAN_JAR" ]; then
- echo "Detected IBM Java - installing xalan.jar..."
- cp "$XALAN_JAR" "$INSTALLED_XALAN_JAR"
- fi
-fi
-
-#-----------------------------------------------------------------------
-# Setup the Python package scanning in case we have Python scripting available
-#-----------------------------------------------------------------------
-JYTHON_CACHE_DIR="$RHQ_SERVER_HOME/jbossas/server/default/data/jython.cachedir"
-PYTHON_ADDITIONAL_CLASSPATH="$RHQ_SERVER_HOME/jbossas/server/default/deploy/rhq.ear/rhq-core-domain-ejb3.jar/./"
-
-# ----------------------------------------------------------------------
-# Prepare the VM command line options to be passed in
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then
- RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Djboss.server.log.dir=${_LOG_DIR_PATH}"
-fi
-# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_JAVA_OPTS.
-# Note that the double equals for the policy file specification IS INTENTIONAL
-RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server $RHQ_SERVER_JAVA_OPTS -Djava.awt.headless=true -Djboss.platform.mbeanserver -Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.util.logging.config.file=$RHQ_SERVER_HOME/jbossas/server/default/conf/logging.properties -Djava.security.manager -Djava.security.policy==$RHQ_SERVER_HOME/bin/rhq-server.security-policy -Dpython.cachedir=$JYTHON_CACHE_DIR -Drhq.python.additional.classpath=$PYTHON_ADDITIONAL_CLASSPATH"
-
-debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS"
-debug_msg "RHQ_SERVER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_ADDITIONAL_JAVA_OPTS"
-
-# run.sh wants the options to be in the JAVA_OPTS variable
-JAVA_OPTS="$RHQ_SERVER_JAVA_OPTS $RHQ_SERVER_ADDITIONAL_JAVA_OPTS"
-export JAVA_OPTS
-
-# ----------------------------------------------------------------------
-# Prepare the command line arguments passed to the RHQ Server JBossAS
-# run.sh script
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then
- _PROPS_FILE_PATH="${RHQ_SERVER_HOME}/bin/rhq-server.properties"
-
- # convert paths if we are on Windows
- if [ -n "$_CYGWIN" ]; then
- _PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"`
- fi
-
- RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}"
-fi
-
-debug_msg "RHQ_SERVER_CMDLINE_OPTS: $RHQ_SERVER_CMDLINE_OPTS"
-debug_msg "RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS: $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS"
-
-# org.jboss.Main parses its command line args such that later options of a
-# certain type, override earlier options of that same type, so make sure the
-# additional opts are added after the base opts, since we want the additional
-# opts to take precedence
-_CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS"
-
-# ----------------------------------------------------------------------
-# Now find the JBossAS run.sh script
-# ----------------------------------------------------------------------
-
-_JBOSS_RUN_SCRIPT="${RHQ_SERVER_HOME}/jbossas/bin/run.sh"
-
-if [ ! -f "$_JBOSS_RUN_SCRIPT" ]; then
- echo "ERROR! Cannot find the JBossAS run script"
- echo "Not found: $_JBOSS_RUN_SCRIPT"
- exit 1
-fi
-debug_msg "_JBOSS_RUN_SCRIPT: $_JBOSS_RUN_SCRIPT"
-
-# ----------------------------------------------------------------------
-# Define where we want to write the pidfiles - let user override the dir
-# Note that we actually have two pidfiles - one is for the script
-# that starts the JBossAS Java virtual machine and the second is the
-# actual server's Java virtual machine process itself.
-# ----------------------------------------------------------------------
-
-if [ -z "$RHQ_SERVER_PIDFILE_DIR" ]; then
- RHQ_SERVER_PIDFILE_DIR="${RHQ_SERVER_HOME}/bin"
-fi
-mkdir -p "$RHQ_SERVER_PIDFILE_DIR"
-
-_SERVER_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-server.pid"
-_JVM_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-jvm.pid"
-
-# ----------------------------------------------------------------------
-# Execute the command that the user wants us to do
-# ----------------------------------------------------------------------
-
-check_status "running"
-
-case "$1" in
-'console')
- if [ "$_SERVER_RUNNING" = "1" ]; then
- echo "$_SERVER_STATUS"
- exit 0
- fi
-
- echo "Starting RHQ Server in console..."
-
- # we are running in foreground, make both pids show the same process
- echo "$$" > "$_SERVER_PIDFILE"
- echo "$$" > "$_JVM_PIDFILE"
-
- # start the server, making sure its working directory is the JBossAS bin directory
- cd "${RHQ_SERVER_HOME}/jbossas/bin"
- "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS
-
- _JBOSS_STATUS=$?
-
- remove_pid_files
-
- exit $_JBOSS_STATUS
- ;;
-
-'start')
- if [ "$_SERVER_RUNNING" = "1" ]; then
- echo "$_SERVER_STATUS"
- exit 0
- fi
-
- echo "Trying to start the RHQ Server..."
-
- LAUNCH_JBOSS_IN_BACKGROUND="$_JVM_PIDFILE"
- export LAUNCH_JBOSS_IN_BACKGROUND
-
- # start the server, making sure its working directory is the JBossAS bin directory
- cd "${RHQ_SERVER_HOME}/jbossas/bin"
- if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
- "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS &
- else
- "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS > /dev/null 2>&1 &
- fi
-
- echo "$!" > "$_SERVER_PIDFILE"
-
- sleep 5
- check_status "starting"
- echo "$_SERVER_STATUS"
-
- if [ "$_SERVER_RUNNING" = "1" ]; then
- exit 0
- else
- echo "Failed to start - make sure the RHQ Server is fully configured properly"
- exit 1
- fi
- ;;
-
-'stop')
- if [ "$_SERVER_RUNNING" = "0" ]; then
- echo "$_SERVER_STATUS"
- remove_pid_files
- exit 0
- fi
-
- echo "Trying to stop the RHQ Server..."
-
- echo "RHQ Server (pid=${_SERVER_PID}) is stopping..."
-
- while [ "$_SERVER_RUNNING" = "1" ]; do
- kill -TERM $_SERVER_PID
- sleep 2
- check_status "stopping..."
- done
-
- remove_pid_files
- echo "RHQ Server has stopped."
- exit 0
- ;;
-
-'kill')
- if [ "$_SERVER_RUNNING" = "0" ]; then
- echo "$_SERVER_STATUS"
- fi
- if [ "$_JVM_RUNNING" = "0" ]; then
- echo "$_JVM_STATUS"
- remove_pid_files
- exit 0
- fi
-
- echo "Trying to kill the RHQ Server..."
-
- echo "RHQ Server parent process (pid=${_SERVER_PID}) is being killed..."
- while [ "$_SERVER_RUNNING" = "1" ]; do
- kill -9 $_SERVER_PID
- sleep 2
- check_status "killing..."
- done
-
- echo "Java Virtual Machine child process (pid=${_JVM_PID}) is being killed..."
- while [ "$_JVM_RUNNING" = "1" ]; do
- kill -9 $_JVM_PID
- sleep 2
- check_status "killing..."
- done
-
- remove_pid_files
- echo "RHQ Server has been killed."
- exit 0
- ;;
-
-'status')
- echo "$_SERVER_STATUS"
- echo "$_JVM_STATUS"
- exit 0
- ;;
-
-*)
- echo "Usage: $0 { start | stop | kill | status | console }"
- exit 1
- ;;
-esac
-
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf b/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
deleted file mode 100644
index cf30c5a..0000000
--- a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
+++ /dev/null
@@ -1,201 +0,0 @@
-#*****************************************************************************
-# RHQ Server Java Service Wrapper Configuration File
-#
-# If you wish to modify these settings or add additional ones, it is
-# recommended that you do not modify this file; instead, create your own
-# override include file named "rhq-server-wrapper.inc" and place it in the
-# same directory where this file is located.
-#
-# See http://wrapper.tanukisoftware.org/doc/english/properties.html
-# for full documentation on all available wrapper.* settings
-#*****************************************************************************
-
-#*****************************************************************************
-# Environment Variables Required
-#
-# All of the below environment variables may be either specified in the
-# process environment or in the wrapper environment configuration file or on
-# the command line. The wrapper environment configuration file must be
-# named "rhq-server-wrapper.env" and must be placed in the same directory
-# where this file is located.
-#
-# Note that all paths must be full, absolute paths unless noted otherwise.
-#
-# set.RHQ_SERVER_HOME - RHQ Server installation directory
-# set.RHQ_SERVER_INSTANCE_NAME - A name to identify the RHQ Server
-# set.RHQ_SERVER_JAVA_EXE_FILE_PATH - Java executable
-# set.RHQ_SERVER_OS_PLATFORM - The operating system platform name
-# set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The Java Service Wrapper's log file (helpful if installing, uninstalling or starting fails)
-#*****************************************************************************
-
-# Load in the specific environment for the RHQ Server instance to start
-#include %RHQ_SERVER_HOME%/bin/wrapper/rhq-server-wrapper.env
-
-#*****************************************************************************
-# Start Properties
-#*****************************************************************************
-# Java JVM Executable (quotes not needed)
-wrapper.java.command=%RHQ_SERVER_JAVA_EXE_FILE_PATH%
-
-# Java Main class. This class must implement the WrapperListener interface. (quotes not needed)
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
-
-# Java Classpath (include wrapper.jar). Add classpath elements starting at 1 (quotes not needed)
-wrapper.java.classpath.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM%/wrapper.jar
-wrapper.java.classpath.2=%RHQ_SERVER_HOME%/jbossas/bin/run.jar
-
-# Java Library Path (location of wrapper.dll/libwrapper.so and other JNI libs) (quotes not needed)
-wrapper.java.library.path.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM%
-
-# The RHQ Server main class as the first argument to the wrapper main class
-wrapper.app.parameter.1=org.jboss.Main
-
-# Additional command line arguments to be passed to the RHQ Server (quotes ARE needed)
-wrapper.app.parameter.2=-c
-wrapper.app.parameter.3=default
-wrapper.app.parameter.4=-P
-wrapper.app.parameter.5="%RHQ_SERVER_HOME%/bin/rhq-server.properties"
-
-# Additional JVM parameters (quotes ARE needed)
-wrapper.java.additional.1=-Dapp.name=rhq-server
-wrapper.java.additional.2=-Xms1024M
-wrapper.java.additional.3=-Xmx1024M
-wrapper.java.additional.4=-XX:PermSize=256M
-wrapper.java.additional.5=-XX:MaxPermSize=256M
-wrapper.java.additional.6="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed"
-wrapper.java.additional.7=-Djava.net.preferIPv4Stack=true
-wrapper.java.additional.8="-Djboss.server.log.dir=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%"
-wrapper.java.additional.9="-Djava.util.logging.config.file=%RHQ_SERVER_HOME%/jbossas/server/default/conf/logging.properties"
-wrapper.java.additional.10=-Djboss.platform.mbeanserver
-wrapper.java.additional.11=-Dsun.lang.ClassLoader.allowArraySyntax=true
-wrapper.java.additional.12=-Djava.security.manager
-# the double equals for the policy file specification IS INTENTIONAL
-wrapper.java.additional.13="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/rhq-server.security-policy"
-#Setup up a cache dir for jython in case python script support was available in the server
-wrapper.java.additional.14="-Dpython.cachedir=%RHQ_SERVER_HOME%/jbossas/server/default/data/jython.cachedir"
-wrapper.java.additional.15="-Drhq.python.additional.classpath=%RHQ_SERVER_HOME%/jbossas/server/default/deploy/rhq.ear/rhq-core-domain-ejb3.jar/./"
-
-# We want to make sure the Server starts in the JBossAS bin directory
-wrapper.working.dir=%RHQ_SERVER_HOME%/jbossas/bin
-
-#*****************************************************************************
-# Wrapper Logging Properties
-#*****************************************************************************
-# if TRUE, this will turn logging level immediately to DEBUG
-wrapper.debug=FALSE
-
-# Format of output for the console. (See docs for formats)
-wrapper.console.format=M
-
-# Log Level for console output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
-wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging. (quotes not needed)
-wrapper.logfile=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/rhq-server-wrapper.log
-
-# Format of output for the log file. (See docs for formats)
-wrapper.logfile.format=LPTM
-
-# Log Level for log file output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
-wrapper.logfile.loglevel=ERROR
-
-# Maximum size that the log file will be allowed to grow to before
-# the log is rolled. Size is specified in bytes. The default value
-# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
-# 'm' (mb) suffix. For example: 10m = 10 megabytes.
-wrapper.logfile.maxsize=1m
-
-# Maximum number of rolled log files which will be allowed before old
-# files are deleted. The default value of 0 implies no limit.
-wrapper.logfile.maxfiles=1
-
-# Log Level for sys/event log output. (See docs for log levels)
-wrapper.syslog.loglevel=NONE
-
-# if JVM hangs, this tries to get a thread dump
-# (if TRUE, then ntservice.console is forced to TRUE as well)
-wrapper.request_thread_dump_on_failed_jvm_exit=FALSE
-
-#*****************************************************************************
-# Wrapper Windows Properties
-#*****************************************************************************
-# Title to use when running as a console
-wrapper.console.title=RHQ Server [%RHQ_SERVER_INSTANCE_NAME%]
-
-#*****************************************************************************
-# Wrapper Windows XP Service Properties
-#*****************************************************************************
-# WARNING - Do not modify any of these properties when an application
-# using this configuration file has been installed as a service.
-# Please uninstall the service before modifying this section. The
-# service can then be reinstalled.
-
-# Name of the service
-wrapper.ntservice.name=%RHQ_SERVER_INSTANCE_NAME%
-
-# Display name of the service
-wrapper.ntservice.displayname=RHQ Server [%RHQ_SERVER_INSTANCE_NAME%]
-
-# Description of the service
-wrapper.ntservice.description=RHQ Server instance named %RHQ_SERVER_INSTANCE_NAME%
-
-# Service dependencies. Add dependencies as needed starting from 1
-wrapper.ntservice.dependency.1=
-
-# Mode in which the service is installed. AUTO_START or DEMAND_START
-wrapper.ntservice.starttype=AUTO_START
-
-# Allow service to interact with desktop (must be FALSE if account is specified)
-wrapper.ntservice.interactive=FALSE
-
-# Show a console - only takes effect if interactive is TRUE
-wrapper.ntservice.console=FALSE
-
-# The service runs as this user; Local System account is used if not specified
-# If prompt is true, the user will be prompted for the password. If false,
-# the password configuration property will be used.
-#wrapper.ntservice.account=.\username
-wrapper.ntservice.password.prompt=TRUE
-#wrapper.ntservice.password=xyz
-
-#*****************************************************************************
-# Wrapper UNIX Service Properties
-#*****************************************************************************
-# For UNIX, make sure it is daemonized
-wrapper.daemonize=TRUE
-
-#*****************************************************************************
-# Wrapper Shutdown Monitoring Properties
-#*****************************************************************************
-# File to be monitored - when anchor file is deleted, the instance will shutdown
-#wrapper.anchorfile=%RHQ_SERVER_HOME%\bin\anchor
-#wrapper.anchor.poll_interval=5
-
-# auto-restart on weird exit status - if exiting normally, just shutdown
-wrapper.on_exit.default=RESTART
-wrapper.on_exit.0=SHUTDOWN
-
-# immediately restart the JVM when java.lang.OutOfMemoryError is detected in its output
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-
-# Determine when to restart or if an invocation simply failed on startup
-wrapper.max_failed_invocations=2
-wrapper.successful_invocation_time=300
-wrapper.startup.timeout=30
-
-# How to poll the VM to make sure it is not hung
-wrapper.ping.interval=30
-wrapper.ping.timeout=45
-wrapper.cpu.timeout=10
-
-# Allow our server some extra time to shutdown, since it may take a while to clear the comm repo
-wrapper.shutdown.timeout=180
-wrapper.jvm_exit.timeout=180
-
-#*****************************************************************************
-# Wrapper Override Properties
-# wrapper.XXX properties defined in this included file override any
-# properties previously defined above.
-#*****************************************************************************
-#include %RHQ_SERVER_HOME%/bin/wrapper/rhq-server-wrapper.inc
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll b/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll
deleted file mode 100644
index 37c4f33..0000000
Binary files a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll and /dev/null differ
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe b/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe
deleted file mode 100644
index a46a2ac..0000000
Binary files a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe and /dev/null differ
diff --git a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar b/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar
deleted file mode 100644
index c766405..0000000
Binary files a/modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar and /dev/null differ
diff --git a/modules/enterprise/server/container/src/main/bin-resources/jbossas/server/default/conf/rhq.truststore b/modules/enterprise/server/container/src/main/bin-resources/jbossas/server/default/conf/rhq.truststore
deleted file mode 100644
index fdaf825..0000000
Binary files a/modules/enterprise/server/container/src/main/bin-resources/jbossas/server/default/conf/rhq.truststore and /dev/null differ
diff --git a/modules/enterprise/server/container/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc b/modules/enterprise/server/container/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
deleted file mode 100644
index fe1185f..0000000
--- a/modules/enterprise/server/container/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Additional dev-only options for the RHQ Server Java Service Wrapper
-#
-
-# enable remote debugging
-wrapper.java.additional.12=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
-
-# enable jprofiler
-#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.13=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.14=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
-
-# disable JVM startup timeout
-wrapper.startup.timeout=0
-# disable JVM ping timeout
-wrapper.ping.timeout=0
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js b/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
deleted file mode 100644
index f520488..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Using this script one can automatically reset a bundle deployment to a specified version.
- *
- * The configuration of the bundle and its version to reset to is located at the top of this file.
- * Please provide the values to the variables as instructed to make this script work in
- * a concrete situation.
- */
-
-//----------------------------- script configuration
-
-/**
- * Replace the "null" with the ID of the bundle destination you want to reset.
- *
- * The ID of the destination can be determined from the URL. If you navigate to
- * some destination of a bundle, the destination ID is the number at the very
- * end of the URL in the address bar of your browser.
- *
- * It can also be determined programmatically using the remote API of the RHQ
- * server but that is beyond the scope of this comment.
- */
-var destinationId = null;
-
-/**
- * Replace the "null" with the ID of the bundle version the deployment should be reset to.
- *
- * As with the destinations, the ID of a bundle version can be determined in the GUI by
- * examining the URL. If you navigate to some version of a bundle, the bundle version ID is
- * the very last number in the URL in the address bar of the browser.
- */
-var bundleVersionId = null;
-
-/**
- * A deployment of the bundle version may require configuration.
- * Normally, this can be provided as a simple javascript object (using the curly braces notation).
- * Each key in the object corresponds to a name of one "rhq:input-property" in the
- * recipe of the bundle.
- *
- * For example, if your deploy.xml recipe contains the following input properties:
- *
- * <rhq:input-property type="string" name="my-string-property" />
- * <rhq:input-property type="boolean" name="my-bool-property" />
- * <rhq:input-property type="integer" name="my-int-property" />
- *
- * You would provide values for those properties as:
- *
- * var deploymentConfig = {
- * "my-string-property" : "value",
- * "my-bool-property" : false,
- * "my-int-property" : 42
- * };
- *
- *
- * Note that the bundle recipes support only a limited set of types of these properties.
- * Please consult the provisioning subsystem documentation for a complete coverage of the bundle recipe
- * capabilities.
- */
-var deploymentConfig = null;
-
-/**
- * The description of the deployment that will be performed.
- */
-var description = "redeploy due to drift";
-
-// DO NOT TOUCH THIS UNLESS YOU FULLY UNDERSTAND WHAT YOU ARE DOING.
-// NOTE: It's essential that isCleanDeployment=true, otherwise files that have drifted will not be replaced with their
-// original versions from the bundle.
-var isCleanDeployment = true;
-
-//-------------------------- script body
-
-var bundles = require('rhq://downloads/bundles');
-
-bundles.deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt b/modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt
deleted file mode 100644
index c1dc783..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-This directory contains connectors that instrument various products to expose
-monitoring data. This monitoring data can then be accessed by the RHQ plugins
-corresponding to those products.
-
-HTTP Response Time Filter
---------------------------
-This is a servlet filter that can measure response times for HTTP requests
-made to servlets and write the response times to a logfile. The filter is
-compatible with any servlet 2.4 or later container running on Java 1.4 or
-later. However, since upport for parsing the response time logfiles is
-only provided by the jboss-as, jboss-as-5, jboss-as-7, and tomcat RHQ
-plugins, it typically is only of value to deploy the filter to JBoss AS
-or Tomcat.
-
-Note, a commons-logging jar is supplied for use with Tomcat 6. It is not
-required for earlier versions of Tomcat, since they already include that jar.
-
-For details on how to deploy the filter to various versions of JBoss AS and
-Tomcat, see:
-
-https://docs.jboss.org/author/display/RHQ/Managed+Product+Configuration
-
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js
deleted file mode 100644
index f7fbdc2..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * file: bundles.js
- *
- * description: this file contains a few helper functions to make working
- * with the bundle subsystem more convenient.
- *
- * Note that you must login before you can load the scripts.
- *
- * author: lkrejci(a)redhat.com
- */
-
-var util = require('./util');
-
-/**
- * A simple function to create a new bundle version from a zip file containing
- * the bundle.
- *
- * @param pathToBundleZipFile the path to the bundle on the local file system
- *
- * @return an instance of BundleVersion class describing what's been created on
- * the RHQ server.
- */
-exports.createBundleVersion = function(pathToBundleZipFile) {
- var bytes = getFileBytes(pathToBundleZipFile)
- return BundleManager.createBundleVersionViaByteArray(bytes)
-}
-
-/**
- * This is a helper function that one can use to find out what base directories
- * given resource type defines.
- * <p>
- * These base directories then can be used when specifying bundle destinations.
- *
- * @param resourceTypeId
- * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
- */
-exports.getAllBaseDirectories = function(resourceTypeId) {
- var crit = new ResourceTypeCriteria;
- crit.addFilterId(resourceTypeId);
- crit.fetchBundleConfiguration(true);
-
- var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
-
- if (types.size() == 0) {
- throw "Could not find a resource type with id " + resourceTypeId;
- } else if (types.size() > 1) {
- throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
- }
-
- var type = types.get(0);
-
- return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
-}
-
-/**
- * Creates a new destination for given bundle. Once a destination exists,
- * actual bundle versions can be deployed to it.
- * <p>
- * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
- * method in the fact that one can provide bundle and resource group names instead of their
- * ids.
- *
- * @param destinationName the name of the destination to be created
- * @param description the description for the destination
- * @param bundleName the name of the bundle to create the destination for
- * @param groupName name of a group of resources that the destination will handle
- * @param baseDirName the name of the basedir definition that represents where inside the
- * deployment of the individual resources the bundle will get deployed
- * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
- *
- * @return BundleDestination object
- */
-exports.createBundleDestination = function(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
- var groupCrit = new ResourceGroupCriteria;
- groupCrit.addFilterName(groupName);
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
-
- if (groups.empty) {
- throw "No group called '" + groupName + "' found.";
- }
-
- var group = groups.get(0);
-
- var bundleCrit = new BundleCriteria;
- bundleCrit.addFilterName(bundleName);
- var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
-
- if (bundles.empty) {
- throw "No bundle called '" + bundleName + "' found.";
- }
-
- var bundle = bundles.get(0);
-
- return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
-}
-
-/**
- * Tries to deploy given bundle version to provided destination using given configuration.
- * <p>
- * This method blocks while waiting for the deployment to complete or fail.
- *
- * @param destination the bundle destination (or id thereof)
- * @param bundleVersion the bundle version to deploy (or id thereof)
- * @param deploymentConfiguration the deployment configuration. This can be an ordinary
- * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
- * it is converted to a Configuration instance using the <code>asConfiguration</code>
- * function from <code>util.js</code>. Please consult the documentation of that method
- * to understand the limitations of that approach.
- * @param description the deployment description
- * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
- * perform as an upgrade to the existing deployment, if any
- *
- * @return the BundleDeployment instance describing the deployment
- */
-exports.deployBundle = function(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
- var destinationId = destination;
- if (typeof(destination) == 'object') {
- destinationId = destination.id;
- }
-
- var bundleVersionId = bundleVersion;
- if (typeof(bundleVersion) == 'object') {
- bundleVersionId = bundleVersion.id;
- }
-
- var deploymentConfig = deploymentConfiguration;
- if (!(deploymentConfiguration instanceof Configuration)) {
- deploymentConfig = util.asConfiguration(deploymentConfiguration);
- }
-
- var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
-
- deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
-
- var crit = new BundleDeploymentCriteria;
- crit.addFilterId(deployment.id);
-
- while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
- java.lang.Thread.currentThread().sleep(1000);
- var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
- if (dps.empty) {
- throw "The deployment disappeared while we were waiting for it to complete.";
- }
-
- deployment = dps.get(0);
- }
-
- return deployment;
-}
-
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js
deleted file mode 100644
index b07eaec..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * file: drift.js
- *
- * description: This script contains functions that illustrate and highlight
- * drift monitoring functionality. Some of the functionality demonstrated in
- * this script is currently available only via RHQ's remote client (and CLI)
- * at the time of this writing.
- *
- * Note that you must login before you can load the scripts. Also please note
- * that if a function is not documented, then it is not intended for public
- * use. It is used only as an internal helper function.
- *
- * author: jsanda(a)redhat.com
- */
-
-var util = require("./util");
-
-/**
- * description: Generates a snapshot of changes sets belonging to a particular
- * drift definition of a specific resource. By default all change sets are
- * included in the snapshot. An optional third argument can be specified to
- * limit or control the number of change sets included in the snapshot.
- *
- * Note that a snapshot is an accumulation or aggregation of change sets that
- * provides a view of a resource, or more precisely, all files being monitored
- * for drift, at a particular version or point in time.
- *
- * arguments:
- * rid: A resource id, expected to be an integer
- *
- * defName: The drift definition name as a string
- *
- * filter: (optional) A map or JS object that limits the number of
- * change sets included in the snapshot. It should specify two
- * properties - startVersion and endVersion.
- *
- * return: A org.rhq.core.domamin.drift.DriftSnapshot object
- *
- * usage:
- * // generates a snapshot that includes all change sets belonging to the
- * // mydrift drift configuration.
- * createSnapshot(123, 'mydrift')
- *
- * // generates a snapshot that includes change sets 3 through 5 inclusive.
- * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5})
- */
-exports.createSnapshot = function(rid, defName) {
- var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) });
- var snapshotRequest;
-
- if (arguments.length > 2) {
- var filters = arguments[2];
- snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion);
- } else {
- snapshotRequest = DriftSnapshotRequest(driftDef.id);
- }
-
- return DriftManager.getSnapshot(snapshotRequest);
-}
-
-/** private helper function to find a drift definition by a filter */
-function findDriftDefinition(rid, filter) {
- var criteria = ResourceCriteria();
- criteria.addFilterId(rid);
- criteria.fetchDriftDefinitions(true);
-
- var resources = ResourceManager.findResourcesByCriteria(criteria);
- var resource = resources.get(0);
-
- return util.find(resource.driftDefinitions, function(config) {
- return filter(DriftDefinition(config));
- });
-}
-
-/**
- * description: Generates a diff report that is printed to the console. By
- * default this function generates a snapshot diff. The function expects two
- * arguments which should be DriftSnapshot objects. A diff between those two
- * snapshots is generated and printed to the console. A path can be specified
- * as an optional third argument. If a path is a specified as a third argument,
- * then a file diff will be performed using the file that matches the path in
- * each change set. The format will be a unified diff.
- *
- * Note that the snapshots can be from the same or from different resources;
- * however, if they are from different resources, it is assumed that the
- * resources are of the same type.
- *
- * arguments:
- * s1: A DriftSnapshot object
- *
- * s2: A DriftSnapshot object
- *
- * path: (optional) A string that specifies a path that exists in both s1 and
- * s2.
- *
- * return: This function does not return a useful value. It may be an empty
- * string or it could be null. Instead of returning its results, the function
- * prints them to the CLI console. As such, this function is intended for
- * use from the interactive CLI shell.
- *
- * usage:
- * // Generates a snapshot diff report
- * diff(s1, s2)
- *
- * // Generates a file diff report in the unified format
- * diff(s1, s2, 'jboss_home/bin/run.conf')
- */
-exports.diff = function(s1, s2) {
- var theDiff = s1.diff(s2);
-
- if (arguments.length > 2) {
- var path = arguments[2];
-
- if (theDiff.elementsInConflict.size() == 0) {
- // If the snapshot diff reports no files in conflict, then there
- // is no need to call the server to perform the file diff. We can
- // instead return quickly.
- println("There are no differences to report");
- return "";
- }
-
- var pathFilter = function(entry) { return entry.path == path; };
- var e1 = util.find(s1.driftInstances, pathFilter);
- var e2 = util.find(s2.driftInstances, pathFilter);
-
- var fileDiff = DriftManager.generateUnifiedDiff(e1, e2);
- util.foreach(fileDiff.diff, println);
- return "";
- }
-
- function printEntry(entry) {
- println(entry.newDriftFile.hashId + '\t' + entry.path);
- }
-
- function report(header, elements) {
- println(header + ':');
- util.foreach(elements, printEntry);
- println('\n');
- }
-
- report('elements in conflict', theDiff.elementsInConflict);
- report('elements not in left', theDiff.elementsNotInLeft);
- report('elements not in right', theDiff.elementsNotInRight);
-}
-
-/**
- * description: Generates and returns the drift history for a file being
- * monitored for drift. This function takes three arguments. The first two, the
- * resource id drift configuration name, uniquely identify the drift
- * configuration. The third argument specifies a path that is set up for
- * monitoring by the drift configuration.
- *
- * arguments:
- * rid: A resource id
- *
- * configName: A drift configuration name
- *
- * path: A path that is set up for drift monitoring by the drift
- * configuration that is identified by the first two arguments. The path
- * should be specified as relative to the base directory from which
- * monitoring is done.
- *
- * return: A History object, which is a native JS object. This object contains
- * a few methods for working with the file history:
- *
- * list: prints a short summary of all versions of the file
- * view: returns the contents of a particular version of the file
- * compare: compares two versions of the file and prints a unified diff
- *
- * usage:
- * $ history = fetchHistory(123, 'mydrift', 'bin/run.conf')
- * $ history.list() // prints a summary of all versions of 'bin/run.conf'
- * $ history.view(1) // returns the full contents of version 1 of the file
- * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2
- */
-exports.fetchHistory = function(rid, driftDefName, path) {
- function History() {
- var entries = [];
-
- function findDrift(version) {
- return util.find(entries, function(drift) {
- return drift.changeSet.version == version
- });
- }
-
-
- var generate = function() {
- entries = [];
- var criteria = GenericDriftCriteria();
- criteria.addFilterResourceIds([rid]);
- criteria.fetchChangeSet(true);
- criteria.addFilterPath(path);
-
- var drifts = DriftManager.findDriftsByCriteria(criteria);
- util.foreach(drifts, function(drift) {
- if (drift.changeSet.driftDefinition.name == driftDefName &&
- drift.path == path) {
- entries.push(drift);
- }
- });
-
- entries.sort(function(d1, d2) {
- return d1.changeSet.version <= d2.changeSet.version
- });
- }
-
- this.list = function() {
- var format = java.text.DateFormat.getDateTimeInstance();
- println(path + "\n-----------------------------------");
- util.foreach(entries, function(drift) {
- println(drift.changeSet.version + "\t" + format.format(drift.ctime));
- });
- }
-
- this.view = function(version) {
- var drift = findDrift(version);
- if (drift == null) {
- return "Could not find version " + version;
- }
- return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId));
- }
-
- this.compare = function(v1, v2) {
- var d1 = findDrift(v1);
- if (d1 == null) {
- return "Could not find version " + v1;
- }
- var d2 = findDrift(v2);
- if (d2 == null) {
- return "Could not find version " + v2;
- }
- var fileDiff = DriftManager.generateUnifiedDiff(d1, d2);
- util.foreach(fileDiff.diff, println);
- }
-
- generate();
- }
-
- return new History();
-}
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js
deleted file mode 100644
index 6369cc1..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js
+++ /dev/null
@@ -1,811 +0,0 @@
-/**
- * This module contains a variety of utility functions for working with JBoss AS in different versions.
- *
- * @author Lukas Krejci
- */
-
-
-var util = require('./util');
-var bundles = require("./bundles");
-
-//init the version-specific objects. We'll be adding the functions to them further down below.
-exports.as7 = {}
-
-/**
- * This creates a new destination in the JBoss AS (4,5,6,7) servers from the provided
- * group and deploys the application provided by the bundle to it. Once the app is deployed,
- * the servers in the group are sequentially stopped and started.
- *
- * @param bundleZipFile the path to the zip file with the application bundle
- * @param deploymentConfiguration the deployment configuration required by the bundle.
- * See the <code>deployBundle</code> in <code>bundles.js</code> to find out about
- * supported formats.
- * @param groupName the name of the compatible group of JBossAS servers to deploy the bundle to
- * @param destinationName the name of the destination that will be created so that the bundle
- * can be deployed to it
- * @param destinationDescription the description of the destination
- * @param baseDirName the name of the base directory for the deployment. Each resource type
- * defines a list of deployment base directories which you can review using, for example,
- * the <code>getAllBaseDirectories(resourceTypeId)</code> function from <code>bundles.js</code>.
- * @param deployDir the name of the directory under the base dir in which the bundle will be
- * deployed to.
- *
- * @return the BundleDeployment instance
- */
-exports.createAppAndRestart = function(bundleZipFile, deploymentConfiguration, groupName, destinationName, destinationDescription, baseDirName, deployDir) {
- var gcrit = new ResourceGroupCriteria;
- gcrit.addFilterName(groupName);
- gcrit.fetchResourceType(true);
-
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(gcrit);
- if (groups.empty) {
- throw "Could not find a resource group called " + groupName;
- } else if (groups.size() > 1) {
- throw "There are more than 1 groups called " + groupName;
- }
-
- var group = groups.get(0);
- var targetResourceType = group.resourceType;
-
- var deployFn = function(restartFn) {
-
- var bundleVersion = bundles.createBundleVersion(bundleZipFile);
- var destination = BundleManager.createBundleDestination(bundleVersion.bundle.id, destinationName, destinationDescription, baseDirName, deployDir, group.id);
-
- var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
-
- if (deployment.status != BundleDeploymentStatus.SUCCESS) {
- throw "Deployment wasn't successful: " + deployment;
- }
-
- restartFn(group);
-
- return deployment;
- };
-
- if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
- return deployFn(_restartAS4);
- } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
- return deployFn(_restartAS5);
- } else if (targetResourceType.plugin == "jboss-as-7" &&
- (targetResourceType.name == "JBossAS7-Standalone" ||
- targetResourceType.name == "JBossAS-Managed")) {
- return deployFn(_restartAS7);
- }
-
- throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
-}
-
-/**
- * Deploys an updated bundle of an enterprise application to a destination that
- * points to a group of JBoss AS(4,5,6,7) servers and then stops all the servers
- * serially and then starts them up again sequentially.
- *
- * @param bundleZipFile
- * the path to the bundle zip file with the application
- * @param jbasDestination
- * the bundle destination the bundle should be deployed to (or id
- * thereof)
- * @param deploymentConfiguration
- * the deployment configuration. This can be an ordinary javascript
- * object (hash) or an instance of RHQ's Configuration. If it is the
- * former, it is converted to the Configuration instance using the
- * <code>asConfiguration</code> function from <code>util.js</code>.
- * Please consult the documentation of that method to understand the
- * limitations of that approach.
- * @param description
- * the deployment description
- *
- * @return the deployment instance
- */
-exports.updateAppAndRestart = function(bundleZipFile, jbasDestination, deploymentConfiguration) {
- // first figure out the jbas version we are deploying to
- var destinationId = jbasDestination;
- if (typeof(jbasDestination) == 'object') {
- destinationId = jbasDestination.id;
- }
-
- var destCrit = new BundleDestinationCriteria
- destCrit.fetchGroup(true)
-
- var destinations = BundleManager.findBundleDestinationsByCriteria(destCrit);
-
- if (destinations.empty) {
- throw "No destinations corresponding to " + jbasDestination + " found on the server.";
- }
-
- var destination = destinations.get(0);
-
- var targetResourceType = destination.group.resourceType;
-
- if (targetResourceType == null) {
- throw "This function expects a compatible group of JBoss AS (4,5,6 or 7) resources but the provided destination is connected with " + destination.group;
- }
-
- var deployFn = function(restartFn) {
- var bundleVersion = bundles.createBundleVersion(bundleZipFile);
- var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
-
- if (deployment.status != BundleDeploymentStatus.SUCCESS) {
- throw "Deployment wasn't successful: " + deployment;
- }
-
- restartFn(destination.group);
-
- return deployment;
- };
-
- if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
- return deployFn(_restartAS4);
- } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
- return deployFn(_restartAS5);
- } else if (targetResourceType.plugin == "jboss-as-7" &&
- (targetResourceType.name == "JBossAS7-Standalone" ||
- targetResourceType.name == "JBossAS-Managed")) {
- return deployFn(_restartAS7);
- }
-
- throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
-}
-
-/**
- * This function adds an AS7 server to a cluster with another AS7 instance, using
- * the provided node name as its identifier.
- * <p>
- * This method only makes the new member use the same configuration as the existing
- * member and synchronizes its jgroups, messaging and modcluster socket bindings
- * with the cluster. Optionally it also copies over all the deployments to the
- * new member.
- * <p>
- * The configurations are therefore assumed to be otherwise compatible - i.e.
- * the infinispan cache containers should be configured correctly (or left at
- * default values, which are configured correctly), etc.
- *
- * @param newAs7Resource the resource proxy of the AS7 instance to add
- * @param newNodeName the node name, i.e. unique identification, of the new member
- * in the cluster
- * @param existingClusterMemberResource an AS7 instance that belongs to a cluster
- * the new member should join into.
- * @param copyDeployments whether or not to copy the deployments from the existing
- * member to the new member
- */
-exports.as7.addToCluster = function(newAs7Resource, newNodeName, existingClusterMemberResource, doCopyDeployments) {
- println("Reading config of the existing cluster member");
- var existingMember = {
- 'id' : existingClusterMemberResource.id,
- 'resourceConfiguration' : _getLiveResourceConfiguration(existingClusterMemberResource),
- 'pluginConfiguration' : _getPluginConfiguration(existingClusterMemberResource)
- };
-
- var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource.children,
- existingMember.pluginConfiguration, existingMember.resourceConfiguration);
-
- println("Reading config of the new member");
- var newMember = {
- 'id' : newAs7Resource.id,
- 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
- 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
- };
-
- var memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
-
- var memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
-
- if (memberConfig['config'] != clusterConfig['config']) {
- println("The configurations of the servers differ.\n" +
- "The new cluster member's configuration will be changed to match the configuration of the existing member.");
-
- newAs7Resource.updatePluginConfiguration(_changeConfig(newMember.pluginConfiguration, clusterConfig['config']));
-
- //we need to restart straight away so that we see the changes to the
- //rest of the configuration caused by the change of current config.
- println("Restarting the new cluster member to switch it to the new configuration.");
- newAs7Resource.restart();
-
- //refresh the resource
- newAs7Resource = ProxyFactory.getResource(newMember.id);
- newMember = {
- 'id' : newAs7Resource.id,
- 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
- 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
- };
-
- //refresh the cluster specific config after the restart with the new
- //config
- memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
- memberResourceConfiguration = newMember.resourceConfiguration;
- }
-
- //now check what's the node name we see
- if (memberConfig['node-name'] != newNodeName) {
- println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'");
- _updateNodeName(memberResourceConfiguration, newNodeName);
-
- newAs7Resource.updateResourceConfiguration(memberResourceConfiguration);
- memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
- }
-
- //now apply the socket binding changes for jgroups and other cluster
- //significant subsystems
- //first find the socket binding group config in the new member
- for(i in newAs7Resource.children) {
- var child = newAs7Resource.children[i];
- if (child.resourceType.name == 'SocketBindingGroup' &&
- child.resourceType.plugin == 'JBossAS7') {
-
- println("Updating socket bindings of jgroups, messaging and modcluster subsystems");
-
- var resourceConfig = _getLiveResourceConfiguration(child);
-
- var portOffset = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
- var clusterMemberPortOffset = clusterConfig['port-offset'];
-
- var newConfig = resourceConfig.deepCopy(false);
-
- _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']);
- _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']);
- _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']);
-
- child.updateResourceConfiguration(newConfig);
- }
- }
-
- println("Restarting the new member for the new socket bindings to take effect.");
- newAs7Resource.restart();
-
- if (doCopyDeployments) {
- println("Copying the deployments to the new cluster member...");
- copyDeployments(existingClusterMemberResource, newAs7Resource);
-
- println("Restarting the new cluster member.");
- newAs7Resource.restart();
- }
-}
-
-/**
- * Copies all deployments from the source to the target. Both resources must
- * be standalone AS7 servers.
- *
- * @param sourceAS7 the resource id or object of the source AS7 standalone instance
- * @param targetAS7 the resource id or object of the target AS7 standalone instance
- */
-exports.as7.copyDeployments = function(sourceAS7, targetAS7) {
- if (typeof sourceAS7 == 'object') {
- sourceAS7 = sourceAS7.id;
- }
-
- if (typeof targetAS7 == 'object') {
- targetAS7 = targetAS7.id;
- }
-
- var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'JBossAS7');
-
- var deploymentsCrit = new ResourceCriteria;
- deploymentsCrit.addFilterParentResourceId(sourceAS7);
- deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id);
-
- var unlimitedPageControl = PageControl.unlimitedInstance;
-
- var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit);
- var iterator = sourceDeployments.iterator();
- while (iterator.hasNext()) {
- var deploymentResource = iterator.next();
- //get a resource proxy for easy access to configurations, etc.
- deploymentResource = ProxyFactory.getResource(deploymentResource.id);
-
- println("Copying deployment " + deploymentResource.name);
-
- var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id);
- var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id);
-
- var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name);
-
- var deploymentConfiguration = new Configuration;
- deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName));
-
- //so now we have both metadata and the data of the deployment, let's
- //push a copy of it to the target server
- var history = ResourceFactoryManager.createPackageBackedResource(targetAS7,
- deploymentResourceType.id, deploymentResource.name,
- deploymentResource.pluginConfiguration,
- installedPackage.packageVersion.generalPackage.name,
- installedPackage.packageVersion.version,
- installedPackage.packageVersion.architecture.id,
- deploymentConfiguration, content, null);
-
- while (history.status.name() == 'IN_PROGRESS') {
- java.lang.Thread.sleep(1000);
- //the API for checking the create histories is kinda weird..
- var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl);
- var hit = histories.iterator();
- var found = false;
- while(hit.hasNext()) {
- var h = hit.next();
-
- if (h.id == history.id) {
- history = h;
- found = true;
- break;
- }
- }
-
- if (!found) {
- throw "The history object for the deployment seems to have disappeared, this is very strange.";
- }
- }
-
- println("Deployment finished with status: " + history.status.toString() +
- (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + ".")));
- }
-}
-
-function _getConfigName(as7PluginConfig) {
- var argsValue = as7PluginConfig.getSimpleValue('startScriptArgs', '');
-
- var args = argsValue.split('\n');
-
- var possibleParams = ['-c ', '-c=', '--server-config='];
-
- var ret = null;
- for (i in args) {
- var arg = args[i];
-
- var found = false;
-
- for(j in possibleParams) {
- var param = possibleParams[j];
- var pos = arg.indexOf(param);
-
- if (pos >= 0) {
- ret = arg.substring(pos + param.length).trim();
- found = true;
- break;
- }
- }
-
- if (found) {
- break;
- }
- }
-
- if (ret != null && ret.startsWith('%') && ret.endsWith('%')) {
- var pluginConfRef = ret.substring(1, ret.length - 1);
- ret = as7PluginConfig.getSimpleValue(pluginConfigRef, null);
- }
-
- return ret;
-}
-
-function _changeConfig(pluginConfig, configName) {
- var argsValue = javascriptString(pluginConfig.getSimpleValue('startScriptArgs', ''));
-
- var args = argsValue.split('\n');
-
- var possibleParams = ['-c ', '-c=', '--server-config='];
-
- var updated = false;
-
- for (i in args) {
- var arg = args[i];
-
- for(j in possibleParams) {
- var param = possibleParams[j];
-
- var pos = arg.indexOf(param);
-
- if (pos >= 0) {
- args[i] = param + configName;
- updated = true;
- break;
- }
- }
-
- if (updated) {
- break;
- }
- }
-
- if (!updated) {
- args.push("-c " + configName);
- }
-
- //join the config back together
- for(i in args) {
- if (i == 0) {
- argsValue = args[i];
- } else {
- argsValue += "\n" + args[i];
- }
- }
-
- pluginConfig.put(new PropertySimple('startScriptArgs', argsValue));
-
- return pluginConfig;
-}
-
-/**
- * The config properties of AS7 can have a form of ${propertyName:defaultvalue}.
- * Because we can't figure out the value of the property if it is defined,
- * (or get at its default value), we return the following hash from this function
- * {
- * property : propertyName,
- * value : defaultvalue
- * }
- *
- * At least one of the keys in the above hash will have a value.
- */
-function _parseValueFromExpr(expr) {
- var strExpr = expr + '';
- if (strExpr.indexOf('${') == 0) {
- var colonIdx = strExpr.indexOf(':');
- if (colonIdx == -1) {
- return { 'property' : expr };
- } else {
- var property = strExpr.substring(2, colonIdx);
- var value = strExpr.substring(colonIdx + 1, strExpr.length - 1);
-
- return { 'property' : property, 'value' : value };
- }
- } else {
- return { 'value' : expr };
- }
-}
-
-/**
- * This converts the result of _parseValueFromExpr() function back into the
- * ${property:defaultvalue} format.
- */
-function _composeValueExpr(parsedValue) {
- if (parsedValue.property == undefined) {
- return parsedValue.value;
- } else {
- return '${' + parsedValue.property + ':' + parsedValue.value + '}';
- }
-}
-
-function _updateNodeName(serverResourceConfiguration, newNodeName) {
- //define it as a system prop
- var systemProps = serverResourceConfiguration.getList('*2');
- if (systemProps == null) {
- systemProps = new PropertyList('*2');
- serverResourceConfiguration.put(systemProps);
- }
-
- var it = systemProps.list.iterator();
- var updated = false;
- while (it.hasNext()) {
- var systemProp = it.next();
- var systemPropName = javascriptString(systemProp.getSimpleValue('name', null));
- if (systemPropName == 'jboss.node.name') {
- var systemPropValue = systemProp.getSimple('value');
- if (systemPropValue == null) {
- systemPropValue = new PropertySimple('value', newNodeName);
- systemProp.put(systemPropValue);
- } else {
- systemPropValue.setValue(newNodeName);
- }
-
- updated = true;
- break;
- }
- }
-
- if (!updated) {
- var systemProp = new PropertyMap('*:name');
- systemProp.put(new PropertySimple('name', 'jboss.node.name'));
- systemProp.put(new PropertySimple('value', newNodeName));
- systemProps.add(systemProp);
- }
-}
-
-function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) {
- portOffset = _parseValueFromExpr(portOffset);
- clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset);
-
- var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0;
- var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ?
- clusterMemberPortOffset.value : 0;
-
- var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue;
-
- var ports = socketBindingsConfig.get('*');
- var portIterator = ports.list.iterator();
-
- var appliedProperties = [];
-
- while (portIterator.hasNext()) {
- var port = portIterator.next();
-
- var name = port.getSimpleValue('name', null);
-
- if (socketBindingConfig[name] != undefined) {
- //k, this is a significant config, port it over
-
- //compute the value of the ports
- if (socketBindingConfig[name]['fixed-port'] == 'true') {
- port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr']));
- port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr']));
- port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
- port.put(new PropertySimple('fixed-port', 'true'));
- } else {
- var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
- if (portExprToUse.value != undefined) {
- portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
- }
-
- var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
- if (multicastPortExprToUse.value != undefined) {
- multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
- }
-
- port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
- port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
- port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
- port.put(new PropertySimple('fixed-port', 'false'));
- }
- appliedProperties.push(name);
- }
- }
-
- //I need contains() and Rhino's Array object apparently doesn't have indexOf()
- //which I could otherwise use.
- appliedProperties = java.util.Arrays.asList(appliedProperties);
-
- //now add to the list the props that were not there
- for(name in socketBindingConfig) {
- if (appliedProperties.contains(name)) {
- continue;
- }
-
- var port = new PropertyMap('binding');
- ports.add(port);
-
- port.put(new PropertySimple('name', name));
- port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
- port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port']));
-
- var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
- if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
- portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
- }
-
- var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
- if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
- multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
- }
-
- port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
- port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
- }
-}
-
-
-/**
- * Returns a javascript hash of configuration properties significant for the
- * cluster configuration.
- *
- * This method is quite simplistic - it merely reads out the important socket
- * bindings and Infinispan configuration properties.
- *
- * It doesn't try to be smart about specifying which concrete caches and cache
- * containers are used for individual subsystems like EJB3, JPA or web apps.
- *
- * @param resource the resource proxy of the AS7
- */
-function _getClusterSignificantConfig(children, pluginConfiguration, resourceConfiguration) {
- var ret = {};
-
- ret['config'] = javascriptString(_getConfigName(pluginConfiguration));
-
- ret['node-name'] = javascriptString(resourceConfiguration.getSimpleValue('node-name', null));
-
- //the standalone server has a single socket binding group
- for(var i in children) {
- var child = children[i];
- if (child.resourceType.plugin != 'JBossAS7') {
- continue;
- }
- if (child.resourceType.name == 'SocketBindingGroup') {
-
- var resourceConfig = _getLiveResourceConfiguration(child);
-
- ret['port-offset'] = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
- var ports = resourceConfig.get('*');
- var portIterator = ports.list.iterator();
-
- var jgroups = {};
- var messaging = {};
- var modcluster = {};
-
- ret['jgroups'] = jgroups;
- ret['messaging'] = messaging;
- ret['modcluster'] = modcluster;
-
- while (portIterator.hasNext()) {
- var port = portIterator.next();
- var name = javascriptString(port.getSimpleValue('name', null));
-
- if (name.indexOf('jgroups') == 0) {
- jgroups[name] = _getSocketBinding(port);
- } else if (name.indexOf('messaging') == 0) {
- messaging[name] = _getSocketBinding(port);
- } else if (name.indexOf('modcluster') == 0) {
- modcluster[name] = _getSocketBinding(port);
- }
- }
- } else if (child.resourceType.name == 'Infinispan') {
- var ispn = {};
- ret['infinispan'] = ispn;
-
- //This has disappeared
- //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value);
- var cacheContainers = {};
- ispn['cache-containers'] = cacheContainers;
-
- for(cc in child.children) {
- var cacheContainer = child.children[cc];
-
- var caches = {};
-
- var containerConfig = _getLiveResourceConfiguration(cacheContainer);
-
- cacheContainers[cacheContainer.name] = {
- 'default-cache' : javascriptString(containerConfig.getSimpleValue('default-cache', null)),
- 'aliases' : _asArray(containerConfig.get('aliases')),
- 'caches' : caches
- };
-
- for (c in cacheContainer.children) {
- var cache = cacheContainer.children[c];
-
- caches[cache.name] = {
- '_flavor' : javascriptString(containerConfig.getSimpleValue('_flavor', null)),
- 'batching' : javascriptString(containerConfig.getSimpleValue('batching', null)),
- 'indexing' : javascriptString(containerConfig.getSimpleValue('indexing', null)),
- 'mode' : javascriptString(containerConfig.getSimpleValue('mode', null))
- };
- }
- }
- }
- }
-
- return ret;
-}
-
-function _getSocketBinding(port) {
- return {
- 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')),
- 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)),
- 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)),
- 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null))
- };
-}
-
-function javascriptString(string) {
- return string == null || string == undefined ? string : string + '';
-}
-
-function _asArray(propertyList) {
- var ret = [];
- if (propertyList == undefined || propertyList == null) {
- return ret;
- }
-
- var it = propertyList.list.iterator();
- while (it.hasNext()) {
- var prop = it.next();
-
- if (prop instanceof PropertySimple) {
- ret.push(javascriptString(prop.stringValue));
- }
- }
-
- return ret;
-}
-
-function _getPluginConfiguration(resource) {
- if (typeof(resource) == 'number') {
- resource = ProxyFactory.getResource(resource)
- } else {
- resource = ProxyFactory.getResource(resource.id)
- }
- return resource.pluginConfiguration
-}
-
-function _getLiveResourceConfiguration(resource) {
- var id;
- if (typeof(resource) == 'number') {
- id = resource;
- } else {
- id = resource.id
- }
-
- return ConfigurationManager.getLiveResourceConfiguration(id, false)
-}
-
-function _loadGroupMembers(group) {
- var crit = new ResourceGroupCriteria;
- crit.addFilterId(group.id);
- crit.fetchExplicitResources(true);
- crit.fetchImplicitResources(true);
-
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(crit)
-
- if (groups.empty) {
- throw "Could not find a previously loaded group on the server: " + group;
- }
-
- return groups.get(0);
-}
-
-function _allResourceIds(group) {
- var list = [];
-
- if (group.explicitResources != null) {
- foreach(group.explicitResources, function(resource) {
- list.push(resource.id);
- });
- }
-
- return list;
-}
-
-function _runOperationSequentially(group, operationName, operationConfig) {
- group = _loadGroupMembers(group);
- var resourceIds = _allResourceIds(group);
-
- var conf = operationConfig;
- if (!(conf instanceof Configuration)) {
- conf = asConfiguration(conf);
- }
-
- // by specifying the resource ids explicitly, we define the order in which
- // the operations will be executed on individual resources (in sequence).
- // if the resourceIds were null, the operations would be invoked all at once
- // in no particular order.
- var schedule = OperationManager.scheduleGroupOperation(group.id, resourceIds, false, operationName, conf, 0, 0, 0, 0, null);
-
- // now we need to wait for all the individual operations on resources to
- // complete
- var crit = new GroupOperationHistoryCriteria;
- crit.addFilterJobId(new JobId(schedule.jobName, schedule.jobGroup));
-
- while (true) {
- // XXX should this be configurable?
- // we're waiting for an AS to start/shutdown which takes time..
- // Let's check in 5s intervals.
- // We're waiting at the start of this loop to also ensure that the server
- // had time to issue the quartz job and persist the history entry.
- java.lang.Thread.currentThread().sleep(5000);
-
- var results = OperationManager.findGroupOperationHistoriesByCriteria(crit);
-
- if (results.empty) {
- throw "Could not find operation history for schedule " + schedule + ". This should not happen.";
- }
-
- var history = results.get(0);
-
- if (history.status != OperationRequestStatus.INPROGRESS) {
- return history;
- }
- }
-}
-
-function _restartAS4(group) {
- _runOperationSequentially(group, "shutdown", new Configuration);
- _runOperationSequentially(group, "start", new Configuration);
-}
-
-function _restartAS5(group) {
- _runOperationSequentially(group, "shutdown", new Configuration);
- _runOperationSequentially(group, "start", new Configuration);
-}
-
-function _restartAS7(group) {
- var shutdownOp = group.resourceType.name == "JBossAS7-Standalone" ? "shutdown" : "server:stop";
- var startOp = group.resourceType.name == "JBossAS7-Standalone" ? "start" : "server:start";
-
- _runOperationSequentially(group, shutdownOp, new Configuration);
- _runOperationSequentially(group, startOp, new Configuration);
-}
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js
deleted file mode 100644
index b67eebc..0000000
--- a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * file: util.js
- *
- * description: This script contains functions that provide core, low-level
- * functionality such as iterating over a collection or searching a collection.
- * This has no other script or library dependencies.
- *
- * author: jsanda(a)redhat.com
- * author: lkrejci(a)redhat.com
- *
- * See also http://johnsanda.blogspot.com/search/label/javascript
- */
-
-
-/**
- * If obj is a JS array or a java.util.Collection, each element is passed to
- * the callback function. If obj is a java.util.Map, each map entry is passed
- * to the callback function as a key/value pair. If obj is none of the
- * aforementioned types, it is treated as a generic object and each of its
- * properties is passed to the callback function as a name/value pair.
- */
-exports.foreach = function (obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- fn(obj[i]);
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- fn(iterator.next());
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator()
- while (iterator.hasNext()) {
- var entry = iterator.next();
- fn(entry.key, entry.value);
- }
- }
- else { // assume we have a generic object
- for (i in obj) {
- fn(i, obj[i]);
- }
- }
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. The first match that is found is returned.
- */
-exports.find = function(obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- if (fn(obj[i])) {
- return obj[i]
- }
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- var next = iterator.next();
- if (fn(next)) {
- return next;
- }
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator();
- while (iterator.hasNext()) {
- var entry = iterator.next();
- if (fn(entry.key, entry.value)) {
- return {key: entry.key, value: entry.value};
- }
- }
- }
- else {
- for (i in obj) {
- if (fn(i, obj[i])) {
- return {key: i, value: obj[i]};
- }
- }
- }
- return null;
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. All of the matches are returned in a java.util.List.
- */
-exports.findAll = function(obj, fn) {
- var matches = java.util.ArrayList();
- if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
- foreach(obj, function(element) {
- if (fn(element)) {
- matches.add(element);
- }
- });
- }
- else {
- foreach(obj, function(key, value) {
- if (fn(theKey, theValue)) {
- matches.add({key: theKey, value: theValue});
- }
- });
- }
- return matches;
-}
-
-/**
- * A convenience function to convert javascript hashes into RHQ's configuration
- * objects.
- * <p>
- * The conversion of individual keys in the hash follows these rules:
- * <ol>
- * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
- * <li> if a value is a hash, it is interpreted as a PropertyMap
- * <li> otherwise it is interpreted as a PropertySimple
- * <li> a null or undefined value is ignored
- * </ol>
- * <p>
- * Note that the conversion isn't perfect, because the hash does not contain enough
- * information to restore the names of the list members.
- * <p>
- * Example: <br/>
- * <pre><code>
- * {
- * simple : "value",
- * list : [ "value1", "value2"],
- * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
- * }
- * </code></pre>
- * gets converted to a configuration object:
- * Configuration:
- * <ul>
- * <li> PropertySimple(name = "simple", value = "value")
- * <li> PropertyList(name = "list")
- * <ol>
- * <li>PropertySimple(name = "list", value = "value1")
- * <li>PropertySimple(name = "list", value = "value2")
- * </ol>
- * <li> PropertyList(name = "listOfMaps")
- * <ol>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value")
- * <li>PropertySimple(name = "k2", value = "value")
- * </ul>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value2")
- * <li>PropertySimple(name = "k2", value = "value2")
- * </ul>
- * </ol>
- * </ul>
- * Notice that the members of the list have the same name as the list itself
- * which generally is not the case.
- */
-exports.asConfiguration = function(hash) {
-
- config = new Configuration;
-
- for(key in hash) {
- value = hash[key];
-
- if (value == null) {
- continue;
- }
-
- (function(parent, key, value) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- function isPrimitive(obj) {
- return typeof(obj) != 'object';
- }
-
- //this is an anonymous function, so the only way it can call itself
- //is by getting its reference via argument.callee. Let's just assign
- //a shorter name for it.
- var me = arguments.callee;
-
- var prop = null;
-
- if (isPrimitive(value)) {
- prop = new PropertySimple(key, new java.lang.String(value));
- } else if (isArray(value)) {
- prop = new PropertyList(key);
- for(var i = 0; i < value.length; ++i) {
- var v = value[i];
- if (v != null) {
- me(prop, key, v);
- }
- }
- } else if (isHash(value)) {
- prop = new PropertyMap(key);
- for(var i in value) {
- var v = value[i];
- if (value != null) {
- me(prop, i, v);
- }
- }
- }
-
- if (parent instanceof PropertyList) {
- parent.add(prop);
- } else {
- parent.put(prop);
- }
- })(config, key, value);
- }
-
- return config;
-}
-
-/**
- * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
- * into a javascript hash.
- *
- * @param configuration
- */
-exports.asHash = function(configuration) {
- ret = {}
-
- iterator = configuration.getMap().values().iterator();
- while(iterator.hasNext()) {
- prop = iterator.next();
-
- (function(parent, prop) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- var me = arguments.callee;
-
- var representation = null;
-
- if (prop instanceof PropertySimple) {
- representation = prop.stringValue;
- } else if (prop instanceof PropertyList) {
- representation = [];
-
- for(var i = 0; i < prop.list.size(); ++i) {
- var child = prop.list.get(i);
- me(representation, child);
- }
- } else if (prop instanceof PropertyMap) {
- representation = {};
-
- var childIterator = prop.getMap().values().iterator();
- while(childIterator.hasNext()) {
- var child = childIterator.next();
-
- me(representation, child);
- }
- }
-
- if (isArray(parent)) {
- parent.push(representation);
- } else if (isHash(parent)) {
- parent[prop.name] = representation;
- }
- })(ret, prop);
- }
- (function(parent) {
-
- })(configuration);
-
- return ret;
-}
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/alert-scripts/README.txt b/modules/enterprise/server/container/src/main/resources/alert-scripts/README.txt
deleted file mode 100644
index 7675cbf..0000000
--- a/modules/enterprise/server/container/src/main/resources/alert-scripts/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains scripts for the scriptlang alert sender.
-Currently JRuby and JavaScript are supported.
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/alert-scripts/example.rb b/modules/enterprise/server/container/src/main/resources/alert-scripts/example.rb
deleted file mode 100644
index 3a01100..0000000
--- a/modules/enterprise/server/container/src/main/resources/alert-scripts/example.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-
-require 'java'
-
-def sendAlert(alert, url, conditions)
-
- puts alert.alertDefinition.name
- puts url
- puts conditions
-
- result = org.rhq.enterprise.server.plugin.pc.alert.SenderResult.new
- state = org.rhq.enterprise.server.plugin.pc.alert.ResultState::SUCCESS
- result.setState(state)
- result.setMessage("Sending via ruby succeeded")
-
- return result
-end
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt b/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
deleted file mode 100644
index ced6071..0000000
--- a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-RHQ-MIB DEFINITIONS ::= BEGIN
-
-IMPORTS
- MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, snmpModules, enterprises
- FROM SNMPv2-SMI
- coldStart
- FROM SNMPv2-MIB
- OBJECT-GROUP, NOTIFICATION-GROUP, MODULE-COMPLIANCE
- FROM SNMPv2-CONF
- DisplayString
- FROM SNMPv2-TC;
-
-rhqMIB MODULE-IDENTITY
- LAST-UPDATED "201112200000Z"
- ORGANIZATION "RHQ-Project"
- CONTACT-INFO "http://www.jboss.org/rhq"
- DESCRIPTION
- "The MIB module for RHQ alerts.
-
- This file is part of the RHQ management platform
- Copyright (C) 2005-2012 Red Hat, Inc.
- All rights reserved.
- "
-
- REVISION "200807110000Z"
- DESCRIPTION "Initial version"
- REVISION "201010180000Z"
- DESCRIPTION "Better trap support"
- REVISION "201112200000Z"
- DESCRIPTION "Also emit resource lineage"
- ::= { snmpModules 1 }
-
-jboss OBJECT IDENTIFIER ::= {enterprises 18016 }
-
-rhq OBJECT IDENTIFIER ::= {jboss 2 }
-
-alert OBJECT IDENTIFIER ::= {rhq 1 }
-
-
-alertName OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..255))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The name of the alert definition for this alert"
- ::= { alert 1 }
-
-alertResourceName OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..255))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The name of the resource that triggered the alert"
- ::= { alert 2 }
-
-
-alertPlatformName OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..255))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The name of the platform hosting the resource"
- ::= { alert 3 }
-
-
-alertCondition OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..4096))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The conditions leading to the alert"
- ::= { alert 4 }
-
-alertSeverity OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..255))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "Severity of the alert."
- ::= { alert 5 }
-
-alertUrl OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..1024))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The url of the individual alert"
- ::= { alert 6 }
-
-alertHierarchy OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..1024))
- MAX-ACCESS read-only
- STATUS current
- DESCRIPTION
- "The hierarchy of the resource that triggered the alert"
- ::= { alert 6 }
-
--- conformance information
-
-snmpMIBConformance
- OBJECT IDENTIFIER ::= { rhqMIB 2 }
-
-snmpMIBCompliances
- OBJECT IDENTIFIER ::= { snmpMIBConformance 1 }
-snmpMIBGroups OBJECT IDENTIFIER ::= { snmpMIBConformance 2 }
-
--- compliance statements
-
-snmpBasicCompliance MODULE-COMPLIANCE
- STATUS current
- DESCRIPTION "TODO"
- MODULE
- MANDATORY-GROUPS { alertGroup, trapGroup }
-
- ::= { snmpMIBCompliances 2 }
-
-alertGroup OBJECT-GROUP
- OBJECTS { alertName,
- alertResourceName,
- alertPlatformName,
- alertCondition,
- alertSeverity,
- alertUrl,
- alertHierarchy }
- STATUS current
- DESCRIPTION "A collection of objects providing information about an alert"
- ::= { snmpMIBGroups 1 }
-
-trapGroup NOTIFICATION-GROUP
- NOTIFICATIONS { coldStart }
- STATUS current
- DESCRIPTION "A collection of notifications for alerts"
- ::= { snmpMIBGroups 2 }
-
-END
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.bat b/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.bat
deleted file mode 100644
index 41a6d80..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.bat
+++ /dev/null
@@ -1,128 +0,0 @@
-@echo off
-rem -------------------------------------------------------------------------
-rem JBoss Bootstrap Script for Win32
-rem -------------------------------------------------------------------------
-
-rem $Id: run.bat 60996 2007-02-28 13:44:01Z dimitris(a)jboss.org $
-
-@if not "%ECHO%" == "" echo %ECHO%
-@if "%OS%" == "Windows_NT" setlocal
-
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
-
-pushd %DIRNAME%..
-set JBOSS_HOME=%CD%
-popd
-
-REM Add bin/native to the PATH if present
-if exist "%JBOSS_HOME%\bin\native" set PATH=%JBOSS_HOME%\bin\native;%PATH%
-if exist "%JBOSS_HOME%\bin\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%JBOSS_HOME%\bin\native
-
-rem Read all command line arguments
-
-REM
-REM The %ARGS% env variable commented out in favor of using %* to include
-REM all args in java command line. See bug #840239. [jpl]
-REM
-REM set ARGS=
-REM :loop
-REM if [%1] == [] goto endloop
-REM set ARGS=%ARGS% %1
-REM shift
-REM goto loop
-REM :endloop
-
-rem Find run.jar, or we can't continue
-
-set RUNJAR=%JBOSS_HOME%\bin\run.jar
-if exist "%RUNJAR%" goto FOUND_RUN_JAR
-echo Could not locate %RUNJAR%. Please check that you are in the
-echo bin directory when running this script.
-goto END
-
-:FOUND_RUN_JAR
-
-if not "%JAVA_HOME%" == "" goto ADD_TOOLS
-
-set JAVA=java
-
-echo JAVA_HOME is not set. Unexpected results may occur.
-echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-goto SKIP_TOOLS
-
-:ADD_TOOLS
-
-set JAVA=%JAVA_HOME%\bin\java
-
-rem A full JDK with toos.jar is not required anymore since jboss web packages
-rem the eclipse jdt compiler and javassist has its own internal compiler.
-if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
-
-rem If exists, point to the JDK javac compiler in case the user wants to
-rem later override the eclipse jdt compiler for compiling JSP pages.
-set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
-
-:SKIP_TOOLS
-
-rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this will
-rem result in including the local directory in the classpath, which makes
-rem error tracking harder.
-if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
-
-set JBOSS_CLASSPATH=%RUN_CLASSPATH%
-
-rem Setup JBoss specific properties
-set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
-
-rem Add -server to the JVM options, if supported
-"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
-if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
-
-rem JVM memory allocation pool parameters. Modify as appropriate.
-set JAVA_OPTS=%JAVA_OPTS% -Xms128M -Xmx512M -XX:MaxPermSize=256M
-
-rem With Sun JVMs reduce the RMI GCs to once per hour
-set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
-
-rem Set path to JDK logging config file.
-set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.config.file=%JBOSS_HOME%\server\default\conf\logging.properties
-
-rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
-rem set JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n %JAVA_OPTS%
-
-rem Setup the java endorsed dirs
-set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
-
-REM If someone runs this startup script directly, these system properties force the defaults.
-REM These only take effect if you run this script directly (developers should only do this)
-REM The server startup scripts should be used to start the JON Server; in which case,
-REM these will be overridden with those values configured at install time.
-
-echo ===============================================================================
-echo.
-echo JBoss Bootstrap Environment
-echo.
-echo JBOSS_HOME: %JBOSS_HOME%
-echo.
-echo JAVA: %JAVA%
-echo.
-echo JAVA_OPTS: %JAVA_OPTS%
-echo.
-echo CLASSPATH: %JBOSS_CLASSPATH%
-echo.
-echo ===============================================================================
-echo.
-
-:RESTART
-"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" org.jboss.Main %*
-if ERRORLEVEL 10 goto RESTART
-
-:END
-if "%NOPAUSE%" == "" pause
-
-:END_NO_PAUSE
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.conf b/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.conf
deleted file mode 100644
index 783112f..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-## -*- shell-script -*- ######################################################
-## ##
-## JBoss Bootstrap Script Configuration ##
-## ##
-##############################################################################
-
-### $Id: run.conf 61641 2007-03-23 16:17:39Z thomas.diesler(a)jboss.com $
-
-#
-# This file is optional; it may be removed if not needed.
-#
-
-#
-# Specify the maximum file descriptor limit, use "max" or "maximum" to use
-# the default, as queried by the system.
-#
-# Defaults to "maximum"
-#
-#MAX_FD="maximum"
-
-#
-# Specify the profiler configuration file to load.
-#
-# Default is to not load profiler configuration file.
-#
-#PROFILER=""
-
-#
-# Specify the location of the Java home directory. If set then $JAVA will
-# be defined to $JAVA_HOME/bin/java, else $JAVA will be "java".
-#
-#JAVA_HOME="/opt/java/jdk"
-
-#
-# Specify the exact Java VM executable to use.
-#
-#JAVA=""
-
-#
-# Specify options to pass to the Java VM.
-#
-if [ -z "$JAVA_OPTS" ]; then
- JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
-fi
-
-# JPDA options. Uncomment and modify as appropriate to enable remote debugging.
-#JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS"
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.sh b/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.sh
deleted file mode 100644
index 3fd720c..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/bin/run.sh
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## JBoss Bootstrap Script ##
-## ##
-### ====================================================================== ###
-
-### $Id: run.sh 75849 2008-07-15 18:43:17Z dimitris(a)jboss.org $ ###
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-GREP="grep"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to puke.
-#
-die() {
- warn $*
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-linux=false;
-case "`uname`" in
- CYGWIN*)
- cygwin=true
- ;;
-
- Darwin*)
- darwin=true
- ;;
-
- Linux)
- linux=true
- ;;
-esac
-
-# Read an optional running configuration file
-if [ "x$RUN_CONF" = "x" ]; then
- RUN_CONF="$DIRNAME/run.conf"
-fi
-if [ -r "$RUN_CONF" ]; then
- . "$RUN_CONF"
-fi
-
-# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
-if [ "$linux" = "true" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JBOSS_HOME" ] &&
- JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$JAVAC_JAR" ] &&
- JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
-fi
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ]; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
- # use the system max
- MAX_FD="$MAX_FD_LIMIT"
- fi
-
- ulimit -n $MAX_FD
- if [ $? -ne 0 ]; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the classpath
-runjar="$JBOSS_HOME/bin/run.jar"
-if [ ! -f "$runjar" ]; then
- die "Missing required file: $runjar"
-fi
-JBOSS_BOOT_CLASSPATH="$runjar"
-
-# Tomcat uses the JDT Compiler
-# Only include tools.jar if someone wants to use the JDK instead.
-# compatible distribution which JAVA_HOME points to
-if [ "x$JAVAC_JAR" = "x" ]; then
- JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar"
-else
- JAVAC_JAR_FILE="$JAVAC_JAR"
-fi
-if [ ! -f "$JAVAC_JAR_FILE" ]; then
- # MacOSX does not have a seperate tools.jar
- if [ "$darwin" != "true" -a "x$JAVAC_JAR" != "x" ]; then
- warn "Missing file: JAVAC_JAR=$JAVAC_JAR"
- warn "Unexpected results may occur."
- fi
- JAVAC_JAR_FILE=
-fi
-
-if [ "x$JBOSS_CLASSPATH" = "x" ]; then
- JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
-else
- JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
-fi
-if [ "x$JAVAC_JAR_FILE" != "x" ]; then
- JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR_FILE"
-fi
-
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
-
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
-
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
- fi
-fi
-
-# Setup JBosst Native library path
-JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
-if [ -d "$JBOSS_NATIVE_DIR" ]; then
- if $cygwin ; then
- export PATH="$JBOSS_NATIVE_DIR:$PATH"
- JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"`
- fi
- if [ "x$LD_LIBRARY_PATH" = "x" ]; then
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
- else
- LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
- fi
- export LD_LIBRARY_PATH
- if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
- else
- JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
- fi
-fi
-
-# Setup JBoss specific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"`
- JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"`
-fi
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo " JBoss Bootstrap Environment"
-echo ""
-echo " JBOSS_HOME: $JBOSS_HOME"
-echo ""
-echo " JAVA: $JAVA"
-echo ""
-echo " JAVA_OPTS: $JAVA_OPTS"
-echo ""
-echo " CLASSPATH: $JBOSS_CLASSPATH"
-echo ""
-echo "========================================================================="
-echo ""
-
-while true; do
- if [ "x$LAUNCH_JBOSS_IN_BACKGROUND" = "x" ]; then
- # Execute the JVM in the foreground
- "$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main "$@"
- JBOSS_STATUS=$?
- else
- # Execute the JVM in the background
- "$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main "$@" &
- JBOSS_PID=$!
- # the LAUNCH_JBOSS_IN_BACKGROUND is actually the full path to the pidfile
- echo $JBOSS_PID > $LAUNCH_JBOSS_IN_BACKGROUND
- # Trap common signals and relay them to the jboss process
- trap "kill -HUP $JBOSS_PID" HUP
- trap "kill -TERM $JBOSS_PID" INT
- trap "kill -QUIT $JBOSS_PID" QUIT
- trap "kill -PIPE $JBOSS_PID" PIPE
- trap "kill -TERM $JBOSS_PID" TERM
- # Wait until the background process exits
- WAIT_STATUS=128
- while [ "$WAIT_STATUS" -ge 128 ]; do
- wait $JBOSS_PID 2>/dev/null
- WAIT_STATUS=$?
- if [ "${WAIT_STATUS}" -gt 128 ]; then
- SIGNAL=`expr ${WAIT_STATUS} - 128`
- SIGNAL_NAME=`kill -l ${SIGNAL}`
- echo "*** JBossAS process (${JBOSS_PID}) received ${SIGNAL_NAME} signal ***" >&2
- fi
- done
- if [ "${WAIT_STATUS}" -lt 127 ]; then
- JBOSS_STATUS=$WAIT_STATUS
- else
- JBOSS_STATUS=0
- fi
- fi
- # If restart doesn't work, check you are running JBossAS 4.0.4+
- # http://jira.jboss.com/jira/browse/JBAS-2483
- # or the following if you're running Red Hat 7.0
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
- if [ "$JBOSS_STATUS" -eq 10 ]; then
- echo "Restarting JBoss..."
- else
- exit $JBOSS_STATUS
- fi
-done
-
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml
deleted file mode 100644
index f6601ab..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE log4j:configuration PUBLIC
- "-//log4j/log4j configuration//EN"
- "http://logging.apache.org/log4j/docs/api/org/apache/log4j/xml/log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- RHQ Server Log4j Configuration -->
-<!-- ===================================================================== -->
-
-<!--
- | For details on configuring Log4J, see: http://logging.apache.org/log4j/docs/
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ========= -->
- <!-- Appenders -->
- <!-- ========= -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <!-- Appender will not log any messages with priority lower than INFO even if the category's priority is set lower.
- So essentially, this means DEBUG and TRACE messages will never be output to the console -->
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- a size-based rolling file appender -->
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/rhq-server-log4j.log"/>
- <param name="Append" value="true"/>
- <param name="MaxFileSize" value="5MB"/>
- <param name="MaxBackupIndex" value="5"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ========================================= -->
- <!-- Categories for the various RHQ subsystems -->
- <!-- ========================================= -->
-
- <!-- unless otherwise overridden, all org, com and net categories will be at INFO level -->
- <category name="org">
- <priority value="INFO"/>
- </category>
- <category name="com">
- <priority value="INFO"/>
- </category>
- <category name="net">
- <priority value="INFO"/>
- </category>
-
- <!-- this will control RHQ categories - set to DEBUG if you want full RHQ debug messages -->
- <!--
- <category name="org.rhq">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on dbsetup and dbupgrade ant tasks and their internals -->
- <category name="org.rhq.core.db.ant">
- <priority value="DEBUG"/>
- </category>
-
- <!-- details on the db setup classes used to build the database schema -->
- <category name="org.rhq.core.db.setup">
- <priority value="DEBUG"/>
- </category>
-
- <!-- details for hourly data compression job -->
- <!--
- <category name="org.rhq.enterprise.server.measurement.MeasurementCompressionManagerBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- trace commands coming in from agents -->
- <!--
- <category name="org.rhq.enterprise.communications.command.server.CommandProcessor">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on baseline calculations -->
- <!--
- <category name="org.rhq.enterprise.server.measurement.MeasurementBaselineManagerBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on incoming remote pojo invocations; emits concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.command.impl.remotepojo.server.RemotePojoInvocationCommandService">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- emits global concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.GlobalConcurrencyLimitCommandListener">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on outgoing messages; emits concurrency limit debug messages -->
- <!--
- <category name="org.rhq.enterprise.communications.command.client.ClientCommandSenderTask">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- details on incoming inventory reports -->
- <!--
- <category name="org.rhq.enterprise.server.discovery.DiscoveryBossBean">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Logs Hibernate statistics used to help trace Hibernate queries -->
- <!--
- <category name="org.rhq.enterprise.server.util.HibernatePerformanceMonitor">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the entire comm module -->
- <!--
- <category name="org.rhq.enterprise.communications">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Agent plugin deployer -->
- <!--
- <category name="org.rhq.enterprise.server.core.plugin">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the enterprise GUI module -->
- <!--
- <category name="org.rhq.enterprise.gui">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Top category for the serializers to log synchronized access to certain subsystems -->
- <!--
- <category name="org.rhq.enterprise.server.util.concurrent">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- INFO level gives full stacks to all threads active in aborted transactions -->
- <!-- Set to WARN to only log these events with single-line messages -->
- <category name="org.rhq.enterprise.server.common.TransactionInterruptInterceptor">
- <priority value="INFO"/>
- </category>
-
- <!-- Setting the status manager bean to DEBUG would allow you to see specific status bits -->
- <!-- DEBUG also has a negative impact on database performance -->
- <category name="org.rhq.enterprise.server.cloud.StatusManagerBean">
- <priority value="INFO" />
- </category>
-
- <!-- Top category for the server-side code, including SLSBs -->
- <!--
- <category name="org.rhq.enterprise.server">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.alert">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.authz">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.cloud">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.configuration">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.content">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.core">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.discovery">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.event">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.measurement">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.operation">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.plugin">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.resource">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.scheduler">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.system">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- <category name="org.rhq.enterprise.server.util">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- ============================================= -->
- <!-- Categories for the various JBossAS subsystems -->
- <!-- ============================================= -->
-
- <category name="org.jboss.ejb.EJBDeployer.verifier">
- <priority value="OFF"/>
- </category>
-
- <category name="org.hibernate.ejb.Ejb3Configuration">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.ejb3.JmxKernelAbstraction">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.ejb3.EJBContainer">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jboss.resource.deployment.RARDeployment">
- <priority value="WARN"/>
- </category>
-
- <category name="org.jgroups">
- <priority value="WARN"/>
- </category>
-
- <category name="jacorb">
- <priority value="WARN"/>
- </category>
-
- <category name="org.hibernate.cfg">
- <priority value="WARN"/>
- </category>
-
- <!-- JBNADM-2090: suppress warnings -->
- <category name="org.hibernate.engine.loading.LoadContexts">
- <priority value="OFF"/>
- </category>
-
- <!-- Suppress heavy ERROR level logging generated due to EJB3SafeEndpointInvoker, which unavoidably
- forces this exception, Hibernate has no workaround. -->
- <category name="org.hibernate.LazyInitializationException">
- <priority value="OFF"/>
- </category>
-
- <!-- Suppress "firstResult/maxResults specified with collection fetch; applying in memory!" WARN messages
- (see https://bugzilla.redhat.com/show_bug.cgi?id=620603). -->
- <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
- <priority value="ERROR"/>
- </category>
-
- <!-- log SQL statements -->
- <!--
- <category name="org.hibernate.SQL">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- log JDBC bind parameters -->
- <!--
- <category name="org.hibernate.type">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- log JDBC bind parameters -->
- <!--
- <category name="org.hibernate.engine.query">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Log all JDBC resource acquisition -->
- <!--
- <category name="org.hibernate.jdbc">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Increase the priority threshold for the RHQ Datasource category
- Useful for debugging connection leaks
- -->
- <!--
- <category name="RHQDS">
- <priority value="DEBUG"/>
- </category>
- -->
- <!--
- <category name="NoTxRHQDS">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <category name="org.jboss.ejb.plugins">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
-
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-
- <!-- JSF RI (i.e. com.sun.faces.*) -->
- <category name="javax.enterprise.resource.webcontainer.jsf.application">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.config">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.context">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.managedbean">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.renderkit">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.taglib">
- <priority value="WARN" />
- </category>
- <category name="javax.enterprise.resource.webcontainer.jsf.timing">
- <priority value="WARN" />
- </category>
-
- <!-- ===================================================== -->
- <!-- Categories for the various 3rd-party libs used by RHQ -->
- <!-- ===================================================== -->
-
- <category name="org.quartz.impl.jdbcjobstore.JobStoreCMT">
- <priority value="WARN"/>
- </category>
-
- <category name="org.quartz.impl.jdbcjobstore.StdRowLockSemaphore">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.apache.commons.validator.ValidatorResources">
- <priority value="OFF"/>
- </category>
-
- <category name="org.apache.struts">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.apache.commons.httpclient">
- <priority value="ERROR"/>
- </category>
-
- <category name="org.ajax4jsf">
- <priority value="WARN"/>
- </category>
-
- <!-- ================= -->
- <!-- The root category -->
- <!-- ================= -->
-
- <root>
- <!-- default log priority -->
- <priority value="INFO"/>
-
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
deleted file mode 100644
index f231f15..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
+++ /dev/null
@@ -1,700 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: jboss-service.xml 8920 2008-01-28 03:27:18Z jmazzitelli $ -->
-
-<!-- ===================================================================== -->
-<!-- JBoss Server Configuration -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- Load all jars from the JBOSS_DIST/server/<config>/lib directory. This
- can be restricted to specific jars by specifying them in the archives
- attribute.
- -->
- <classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
-
- <!-- ==================================================================== -->
- <!-- JSR-77 Single JBoss Server Management Domain -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
- name="jboss.management.local:j2eeType=J2EEDomain,name=Manager">
- <attribute name="MainDeployer">jboss.system:service=MainDeployer</attribute>
- <attribute name="SARDeployer">jboss.system:service=ServiceDeployer</attribute>
- <attribute name="EARDeployer">jboss.j2ee:service=EARDeployer</attribute>
- <attribute name="EJBDeployer">jboss.ejb:service=EJBDeployer</attribute>
- <attribute name="RARDeployer">jboss.jca:service=RARDeployer</attribute>
- <attribute name="CMDeployer">jboss.jca:service=ConnectionFactoryDeployer</attribute>
- <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
- <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
- <attribute name="MailService">jboss:service=Mail</attribute>
- <attribute name="JMSService">jboss.mq:service=DestinationManager</attribute>
- <attribute name="JNDIService">jboss:service=Naming</attribute>
- <attribute name="JTAService">jboss:service=TransactionManager</attribute>
- <attribute name="UserTransactionService">jboss:service=ClientUserTransaction</attribute>
- <attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- XMBean Persistence -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.system.pm.AttributePersistenceService"
- name="jboss:service=AttributePersistenceService"
- xmbean-dd="resource:xmdesc/AttributePersistenceService-xmbean.xml">
- <!-- the AttributePersistenceService is persistent, itself -->
-
- <!--
- <attribute name="AttributePersistenceManagerClass">org.jboss.system.pm.XMLAttributePersistenceManager</attribute>
- <attribute name="AttributePersistenceManagerConfig">
- <data-directory>data/xmbean-attrs</data-directory>
- </attribute>
- <attribute name="ApmDestroyOnServiceStop">false</attribute>
- <attribute name="VersionTag"></attribute>
- -->
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Thread Pool -->
- <!-- ==================================================================== -->
-
- <!-- A Thread pool service -->
- <mbean code="org.jboss.util.threadpool.BasicThreadPool"
- name="jboss.system:service=ThreadPool">
- <attribute name="Name">JBoss System Threads</attribute>
- <attribute name="ThreadGroupName">System Threads</attribute>
- <!-- How long a thread will live without any tasks in MS -->
- <attribute name="KeepAliveTime">60000</attribute>
- <!-- The max number of threads in the pool -->
- <attribute name="MaximumPoolSize">10</attribute>
- <!-- The max number of tasks before the queue is full -->
- <attribute name="MaximumQueueSize">1000</attribute>
- <!-- The behavior of the pool when a task is added and the queue is full.
- abort - a RuntimeException is thrown
- run - the calling thread executes the task
- wait - the calling thread blocks until the queue has room
- discard - the task is silently discarded without being run
- discardOldest - check to see if a task is about to complete and enque
- the new task if possible, else run the task in the calling thread
- -->
- <attribute name="BlockingMode">run</attribute>
- </mbean>
-
- <!-- Preload all custom editors for VMs that don't use the thread
- context class loader when searching for PropertyEditors. Uncomment
- if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
- <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
- name="jboss:type=Service,name=BootstrapEditors">
- <attribute name="BootstrapEditors">
- java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
- java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
- java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
- java.util.Date=org.jboss.util.propertyeditor.DateEditor
- java.io.File=org.jboss.util.propertyeditor.FileEditor
- java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
- java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
- javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
- java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
- [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
- java.net.URL=org.jboss.util.propertyeditor.URLEditor
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
- this needs to be set to avoid a possible deadlock on exception at the
- appender level. See bug#696819.
- -->
- <attribute name="Log4jQuietMode">true</attribute>
- <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
- <attribute name="RefreshPeriod">60</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Active Alarm Table -->
- <!-- ==================================================================== -->
-
- <!--
- | The ActiveAlarmTable service is a simple JMX notification listener
- | that maintains a table with the received notifications (alarms).
- | The alarms can be acknowledged through the jmx or the web console.
- | Modify the SubscriptionList below to subscribe for any notification
- | in the system and treat it as an alarm.
- | The JMXNotificationAppender is a log4j Appender that can be configured
- | in log4j.xml, that trasforms logging events to JMX notification so they
- | can be fed back into the table. By storing the WARN or higher level logging
- | events you can have a quick view of important system faults.
- |
- | The following attributes may be set:
- |
- | MaxTableSize (default 1000)
- | - set an upper limit to the number of stored alarms
- | LogLevel (default DEBUG)
- | - the log level to use for received notification, can be set to NONE
- | ServerId (default jboss)
- | - used to construct unique alarm ids
- | SubscriptionList
- | - subscribe for the notifications to be stored in the table
-
- <mbean code="org.jboss.monitor.services.ActiveAlarmTable"
- name="jboss.monitor:service=ActiveAlarmTable">
- <attribute name="SubscriptionList">
- <subscription-list>
- <mbean name="jboss.monitor:*">
- <notification type="jboss.alarm"/>
- <notification type="JBOSS_MONITOR_NOTIFICATION"/>
- </mbean>
- <mbean name="jboss.system:service=Logging,type=JMXNotificationAppender"/>
- </subscription-list>
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- JBoss RMI Classloader - only install when available -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
- name="jboss.rmi:type=RMIClassLoader">
- <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
- <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Service Binding -->
- <!-- ==================================================================== -->
-
- <!-- Automatically activated when generatting the clustering environment -->
- <!-- @TESTSUITE_CLUSTER_CONFIG@ -->
-
- <!--
- | Binding service manager for port/host mapping. This is a sample
- | config that demonstrates a JBoss instances with a server name 'ports-01'
- | loading its bindings from an XML file using the ServicesStoreFactory
- | implementation returned by the XMLServicesStoreFactory.
- |
- | ServerName: The unique name assigned to a JBoss server instance for
- | lookup purposes. This allows a single ServicesStore to handle mulitiple
- | JBoss servers.
- |
- | StoreURL: The URL string passed to org.jboss.services.binding.ServicesStore
- | during initialization that specifies how to connect to the bindings store.
- | StoreFactory: The org.jboss.services.binding.ServicesStoreFactory interface
- | implementation to create to obtain the ServicesStore instance.
-
- <mbean code="org.jboss.services.binding.ServiceBindingManager"
- name="jboss.system:service=ServiceBindingManager">
- <attribute name="ServerName">ports-01</attribute>
- <attribute name="StoreURL">${jboss.home.url}/docs/examples/binding-manager/sample-bindings.xml</attribute>
- <attribute name="StoreFactoryClassName">
- org.jboss.services.binding.XMLServicesStoreFactory
- </attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- Class Loading -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.web.WebService"
- name="jboss:service=WebService">
- <attribute name="Port">${rhq.server.startup.webservice.port:9093}</attribute> <!-- RHQ -->
- <!-- Should non-EJB .class files be downloadable -->
- <attribute name="DownloadServerClasses">false</attribute> <!-- RHQ -->
- <!-- Should resources other than .class files be downloadable. Both
- DownloadServerClasses and DownloadResources must be true for resources
- to be downloadable. This is false by default because its generally a
- bad idea as server configuration files that container security
- information can be accessed.
- -->
- <attribute name="DownloadResources">false</attribute>
- <attribute name="Host">${jboss.bind.address}</attribute>
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <!-- Use the default thread pool for dynamic class loading -->
- <depends optional-attribute-name="ThreadPool"
- proxy-type="attribute">jboss.system:service=ThreadPool</depends>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- JNDI -->
- <!-- ==================================================================== -->
-
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <mbean code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller">
- </mbean>
-
- <!-- A simple mbean wrapper around the jndi Naming object. This
- only handles an in memory instance. The NamingService uses this
- as the JNDI store and exposes it remotely.
- -->
- <mbean code="org.jnp.server.NamingBeanImpl"
- name="jboss:service=NamingBeanImpl"
- xmbean-dd="resource:xmdesc/NamingBean-xmbean.xml">
- </mbean>
-
- <mbean code="org.jboss.naming.NamingService"
- name="jboss:service=Naming"
- xmbean-dd="resource:xmdesc/NamingService-xmbean.xml">
- <!-- The call by value mode. true if all lookups are unmarshalled using
- the caller's TCL, false if in VM lookups return the value by reference.
- -->
- <attribute name="CallByValue">false</attribute>
- <!-- The listening port for the bootstrap JNP service. Set this to -1
- to run the NamingService without the JNP invoker listening port.
- -->
- <attribute name="Port">${rhq.server.startup.namingservice.port:2099}</attribute> <!-- RHQ -->
- <!-- The bootstrap JNP server bind address. This also sets the default
- RMI service bind address. Empty == all addresses
- -->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <!-- The port of the RMI naming service, 0 == anonymous -->
- <attribute name="RmiPort">${rhq.server.startup.namingservice.rmiport:2098}</attribute> <!-- RHQ -->
- <!-- The RMI service bind address. Empty == all addresses
- -->
- <attribute name="RmiBindAddress">${jboss.bind.address}</attribute>
- <!-- The thread pool service used to control the bootstrap lookups -->
- <depends optional-attribute-name="LookupPool"
- proxy-type="attribute">jboss.system:service=ThreadPool</depends>
- <!-- An example of using the unifed invoker as the transport.
- <depends optional-attribute-name="InvokerProxyFactory"
- proxy-type="attribute">jboss:service=proxyFactory,type=unified,target=Naming</depends>
- -->
- <depends optional-attribute-name="Naming"
- proxy-type="attribute">jboss:service=NamingBeanImpl</depends>
- </mbean>
-
- <mbean code="org.jboss.naming.JNDIView"
- name="jboss:service=JNDIView"
- xmbean-dd="resource:xmdesc/JNDIView-xmbean.xml">
- <!-- The HANamingService service name -->
- <attribute name="HANamingService">jboss:service=HAJNDI</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Security -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.security.plugins.SecurityConfig"
- name="jboss.security:service=SecurityConfig">
- <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
- </mbean>
- <mbean code="org.jboss.security.auth.login.XMLLoginConfig"
- name="jboss.security:service=XMLLoginConfig">
- <attribute name="ConfigResource">login-config.xml</attribute>
- </mbean>
-
- <!-- JAAS security manager and realm mapping -->
- <mbean code="org.jboss.security.plugins.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <!-- A flag which indicates whether the SecurityAssociation server mode
- is set on service creation. This is true by default since the
- SecurityAssociation should be thread local for multi-threaded server
- operation.
- -->
- <attribute name="ServerMode">true</attribute>
- <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute>
- <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute>
- <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout
- in seconds.
- If you want to disable caching of security credentials, set this to 0 to
- force authentication to occur every time. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheTimeout">1800</attribute>
- <!-- DefaultCacheResolution: Specifies the default timed cache policy
- resolution in seconds. This controls the interval at which the cache
- current timestamp is updated and should be less than the DefaultCacheTimeout
- in order for the timeout to be meaningful. This has no affect if the
- AuthenticationCacheJndiName has been changed from the default value.
- -->
- <attribute name="DefaultCacheResolution">60</attribute>
- <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the
- security managers to be deep copies that makes copies of the subject
- principals and credentials if they are cloneable. It should be set to
- true if subject include mutable content that can be corrupted when
- multiple threads have the same identity and cache flushes/logout clearing
- the subject in one thread results in subject references affecting other
- threads.
- -->
- <attribute name="DeepCopySubjectMode">false</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Transactions -->
- <!-- ==================================================================== -->
-
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
-
- <!--
- | The fast in-memory transaction manager.
- | Deprecated in JBossAS v4.2. Use JBossTS JTA instead.
- - ->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
- <attribute name="TransactionTimeout">300</attribute>
- <!- - set to false to disable transaction demarcation over IIOP - ->
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
-
- <!- - Transaction Integrity Checking - ->
- <!- - Force a rollback if another thread is associated with the transaction at commit - ->
- <!- - <depends optional-attribute-name="TransactionIntegrityFactory"
- proxy-type="org.jboss.tm.integrity.TransactionIntegrityFactory">
- <mbean code="org.jboss.tm.integrity.FailIncompleteTransaction"
- name="jboss:service=TransactionManager,plugin=TransactionIntegrity"/>
- </depends> - ->
- </mbean>
- -->
-
- <!-- JBoss Transactions JTA -->
- <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
- name="jboss:service=TransactionManager">
- <attribute name="TransactionTimeout">600</attribute> <!-- RHQ -->
- <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute>
- <attribute name="StatisticsEnabled">true</attribute>
- </mbean>
-
- <!--
- | UserTransaction support.
- -->
- <mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
- name="jboss:service=ClientUserTransaction"
- xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
- <depends>
- <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
- name="jboss:service=proxyFactory,target=ClientUserTransactionFactory">
- <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
- <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
- <attribute name="JndiName">UserTransactionSessionFactory</attribute>
- <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSessionFactory</attribute>
- <attribute name="ClientInterceptors">
- <interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </interceptors>
- </attribute>
- <depends>jboss:service=invoker,type=jrmp</depends>
- </mbean>
- </depends>
- <depends optional-attribute-name="TxProxyName">
- <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
- name="jboss:service=proxyFactory,target=ClientUserTransaction">
- <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
- <attribute name="TargetName">jboss:service=ClientUserTransaction</attribute>
- <attribute name="JndiName"></attribute>
- <attribute name="ExportedInterface">org.jboss.tm.usertx.interfaces.UserTransactionSession</attribute>
- <attribute name="ClientInterceptors">
- <interceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </interceptors>
- </attribute>
- <depends>jboss:service=invoker,type=jrmp</depends>
- </mbean>
- </depends>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Invokers to the JMX node -->
- <!-- ==================================================================== -->
-
- <!-- Unified invoker (based on remoting) -->
- <mbean code="org.jboss.invocation.unified.server.UnifiedInvoker"
- name="jboss:service=invoker,type=unified">
- <!-- To turn on strict RMI exception propagation uncomment block below -->
- <!-- This will cause the UnifiedInvokerProxy to wrap RemoteExceptions -->
- <!-- within a ServerException, otherwise will throw root exception -->
- <!-- (not RemoteException) -->
- <!-- <attribute name="StrictRMIException">true</attribute> -->
- <depends>jboss:service=TransactionManager</depends>
- <depends>jboss.remoting:service=Connector,transport=socket</depends>
- </mbean>
-
- <!-- RMI/JRMP invoker -->
- <mbean code="org.jboss.invocation.jrmp.server.JRMPInvoker"
- name="jboss:service=invoker,type=jrmp">
- <attribute name="RMIObjectPort">${rhq.server.startup.jrmpinvoker.rmiport:7444}</attribute> <!-- RHQ -->
- <attribute name="ServerAddress">${jboss.bind.address}</attribute>
- <!--
- <attribute name="RMIClientSocketFactory">custom</attribute>
- <attribute name="RMIServerSocketFactory">custom</attribute>
- <attribute name="RMIServerSocketAddr">custom</attribute>
- <attribute name="SecurityDomain">ssl-domain-name</attribute>
- -->
- <depends>jboss:service=TransactionManager</depends>
- </mbean>
-
- <mbean code="org.jboss.invocation.local.LocalInvoker"
- name="jboss:service=invoker,type=local">
-
- <depends>jboss:service=TransactionManager</depends>
- </mbean>
-
- <mbean code="org.jboss.invocation.pooled.server.PooledInvoker"
- name="jboss:service=invoker,type=pooled">
- <attribute name="NumAcceptThreads">1</attribute>
- <attribute name="MaxPoolSize">300</attribute>
- <attribute name="ClientMaxPoolSize">300</attribute>
- <attribute name="SocketTimeout">60000</attribute>
- <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
- <attribute name="ServerBindPort">${rhq.server.startup.pooledinvoker.rmiport:7445}</attribute> <!-- RHQ -->
- <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
- <attribute name="ClientConnectPort">0</attribute>
- <attribute name="ClientRetryCount">1</attribute>
- <attribute name="EnableTcpNoDelay">false</attribute>
-
- <!-- Customized socket factory attributes
- <attribute name="ClientSocketFactoryName">custom.client.factory</attribute>
- <attribute name="ServerSocketFactoryName">custom.server.factory</attribute>
- <attribute name="SslDomain">java:/jaas/pooledInvoker</attribute>
- -->
- <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- Remoting services -->
- <!-- ==================================================================== -->
-
- <!-- For detailed description of all these configuration attributes, please see the -->
- <!-- JBoss Remoting User's Guide or wiki (http://labs.jboss.com/portal/jbossremoting/docs/guide/index.html) -->
-
- <!-- The NetworkRegistry contains all the local and remote -->
- <!-- servers that it recognizes. The remote ones registered -->
- <!-- are dependant on the detectors running and which domains -->
- <!-- they are configured to identify. -->
- <mbean code="org.jboss.remoting.network.NetworkRegistry"
- name="jboss.remoting:service=NetworkRegistry"/>
-
- <!-- The Connector is the core component of the remoting server service. -->
- <!-- It binds the remoting invoker (transport protocol, callback configuration, -->
- <!-- data marshalling, etc.) with the invocation handlers. -->
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:service=Connector,transport=socket"
- display-name="Socket transport Connector">
-
- <!-- Can either just specify the InvokerLocator attribute and not the invoker element in the -->
- <!-- Configuration attribute, or do the full invoker configuration in the in invoker element -->
- <!-- of the Configuration attribute. -->
-
- <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
- <!-- otherwise, parser will complain. -->
- <!-- <attribute name="InvokerLocator"><![CDATA[socket://${jboss.bind.address}:4446/?datatype=invocation]]></attribute> -->
-
- <attribute name="Configuration">
- <!-- Using the following <invoker> element instead of the InvokerLocator above because specific attributes needed. -->
- <!-- If wanted to use any of the parameters below, can just add them as parameters to the url above if wanted use the InvokerLocator attribute. -->
- <config>
- <!-- Other than transport type and handler, none of these configurations are required (will just use defaults). -->
- <invoker transport="socket">
- <attribute name="dataType" isParam="true">invocation</attribute>
- <attribute name="marshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationMarshaller</attribute>
- <attribute name="unmarshaller" isParam="true">org.jboss.invocation.unified.marshall.InvocationUnMarshaller</attribute>
- <!-- This will be port on which the marshall loader port runs on. -->
- <!-- <attribute name="loaderport" isParam="true">4447</attribute> -->
- <!-- The following are specific to socket invoker -->
- <!-- <attribute name="numAcceptThreads">1</attribute>-->
- <!-- <attribute name="maxPoolSize">303</attribute>-->
- <!-- <attribute name="clientMaxPoolSize" isParam="true">304</attribute>-->
- <attribute name="socketTimeout" isParam="true">600000</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">${rhq.server.startup.unifiedinvoker.port:5446}</attribute> <!-- RHQ -->
- <!-- <attribute name="clientConnectAddress">216.23.33.2</attribute> -->
- <!-- <attribute name="clientConnectPort">7777</attribute> -->
- <attribute name="enableTcpNoDelay" isParam="true">true</attribute>
- <!-- <attribute name="backlog">200</attribute>-->
- <!-- The following is for callback configuration and is independant of invoker type -->
- <!-- <attribute name="callbackMemCeiling">30</attribute>-->
- <!-- indicates callback store by fully qualified class name -->
- <!-- <attribute name="callbackStore">org.jboss.remoting.CallbackStore</attribute>-->
- <!-- indicates callback store by object name -->
- <!-- <attribute name="callbackStore">jboss.remoting:service=CallbackStore,type=Serializable</attribute> -->
- <!-- config params for callback store. if were declaring callback store via object name, -->
- <!-- could have specified these config params there. -->
- <!-- StoreFilePath indicates to which directory to write the callback objects. -->
- <!-- The default value is the property value of 'jboss.server.data.dir' and if this is not set, -->
- <!-- then will be 'data'. Will then append 'remoting' and the callback client's session id. -->
- <!-- An example would be 'data\remoting\5c4o05l-9jijyx-e5b6xyph-1-e5b6xyph-2'. -->
- <!-- <attribute name="StoreFilePath">callback</attribute>-->
- <!-- StoreFileSuffix indicates the file suffix to use for the callback objects written to disk. -->
- <!-- The default value for file suffix is 'ser'. -->
- <!-- <attribute name="StoreFileSuffix">cst</attribute>-->
- </invoker>
-
- <!-- At least one handler is required by the connector. If have more than one, must decalre -->
- <!-- different subsystem values. Otherwise, all invocations will be routed to the only one -->
- <!-- that is declared. -->
- <handlers>
- <!-- can also specify handler by fully qualified classname -->
- <handler subsystem="invoker">jboss:service=invoker,type=unified</handler>
- </handlers>
- </config>
- </attribute>
- <depends>jboss.remoting:service=NetworkRegistry</depends>
- </mbean>
-
-
- <!-- <mbean code="org.jboss.remoting.detection.jndi.JNDIDetector"-->
- <!-- name="jboss.remoting:service=Detector,transport=jndi">-->
- <!-- host to which the detector will connect to for the JNDI server. -->
- <!-- <attribute name="Host">localhost</attribute>-->
- <!-- port to which detector will connect to for the JNDI server. -->
- <!-- <attribute name="Port">5555</attribute>-->
- <!-- context factory string used when connecting to the JNDI server. -->
- <!-- The default is org.jnp.interfaces.NamingContextFactory. -->
- <!-- <attribute name="ContextFactory">org.acme.NamingContextFactory</attribute> -->
- <!-- url package string to use when connecting to the JNDI server. -->
- <!-- The default is org.jboss.naming:org.jnp.interfaces. -->
- <!-- <attribute name="URLPackage">org.acme.naming</attribute> -->
- <!-- Sets the number of detection iterations before manually pinging -->
- <!-- remote server to make sure still alive. This is needed since remote server -->
- <!-- could crash and yet still have an entry in the JNDI server, -->
- <!-- thus making it appear that it is still there. The default value is 5. -->
- <!-- <attribute name="CleanDetectionNumber">20</attribute>-->
-
- <!-- Specifies the domains in which the detector will recognize -->
- <!-- detections. If servers are not configured to be in these -->
- <!-- domains, they will not be added to NetworkRegistry. -->
- <!-- <attribute name="Configuration">-->
- <!-- <domains>-->
- <!-- <domain>roxanne</domain>-->
- <!-- <domain>sparky</domain>-->
- <!-- </domains>-->
- <!-- </attribute>-->
- <!-- </mbean>-->
-
-
- <!-- ==================================================================== -->
- <!-- Monitoring and Management -->
- <!-- ==================================================================== -->
-
- <!-- Uncomment to enable JMX monitoring of the bean cache
- <mbean code="org.jboss.monitor.BeanCacheMonitor"
- name="jboss.monitor:name=BeanCacheMonitor"/>
- -->
-
- <!-- Uncomment to enable JMX monitoring of the entity bean locking
- <mbean code="org.jboss.monitor.EntityLockMonitor"
- name="jboss.monitor:name=EntityLockMonitor"/>
- -->
-
- <!-- ==================================================================== -->
- <!-- An MBean that is a registry for JDBC type-mapping metadata -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ejb.plugins.cmp.jdbc.metadata.MetaDataLibrary"
- name="jboss.jdbc:service=metadata"/>
-
- <!-- ==================================================================== -->
- <!-- Deployment Scanning -->
- <!-- ==================================================================== -->
-
- <!-- An mbean for hot deployment/undeployment of archives.
- -->
- <mbean code="org.jboss.deployment.scanner.URLDeploymentScanner"
- name="jboss.deployment:type=DeploymentScanner,flavor=URL">
-
- <!-- Uncomment (and comment/remove version below) to enable usage of the
- DeploymentCache
- <depends optional-attribute-name="Deployer">jboss.deployment:type=DeploymentCache</depends>
- -->
- <depends optional-attribute-name="Deployer">jboss.system:service=MainDeployer</depends>
-
- <!-- The URLComparator can be used to specify a deployment ordering
- for deployments found in a scanned directory. The class specified
- must be an implementation of java.util.Comparator, it must be able
- to compare two URL objects, and it must have a no-arg constructor.
- Two deployment comparators are shipped with JBoss:
- - org.jboss.deployment.DeploymentSorter
- Sorts by file extension, as follows:
- "sar", "service.xml", "rar", "jar", "war", "wsr", "ear", "zip",
- "*"
- - org.jboss.deployment.scanner.PrefixDeploymentSorter
- If the name portion of the url begins with 1 or more digits, those
- digits are converted to an int (ignoring leading zeroes), and
- files are deployed in that order. Files that do not start with
- any digits will be deployed first, and they will be sorted by
- extension as above with DeploymentSorter.
- -->
- <attribute name="URLComparator">org.jboss.deployment.DeploymentSorter</attribute>
-
- <!--
- <attribute name="URLComparator">org.jboss.deployment.scanner.PrefixDeploymentSorter</attribute>
- -->
-
- <!-- The FilterInstance specifies a URLLister.URLFilter for scanned
- directories. This DeploymentFilter is initialized with the given
- prefixes, suffixes and matches that define which URLs should be
- ignored.
- -->
- <attribute name="FilterInstance"
- attributeClass="org.jboss.deployment.scanner.DeploymentFilter"
- serialDataType="javaBean">
- <!-- Files starting with theses strings are ignored -->
- <property name="prefixes">#,%,\,,.,_$</property>
- <!-- Files ending with theses strings are ignored -->
- <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
- <!-- Files matching with theses strings are ignored -->
- <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
- </attribute>
-
- <!-- Frequency in milliseconds to rescan the URLs for changes -->
- <attribute name="ScanPeriod">5000</attribute>
-
- <!-- A flag to disable the scans -->
- <attribute name="ScanEnabled">true</attribute>
-
- <!-- URLs are comma separated and resolve relative to the server home URL
- unless the given path is absolute. If the URL ends in "/" it is
- considered a collection and scanned, otherwise it is simply deployed;
- this follows RFC2518 convention and allows discrimination between
- collections and directories that are simply unpacked archives.
-
- URLs may be local (file:) or remote (http:). Scanning is supported
- for remote URLs but unpacked deployment units are not.
-
- Example URLs:
- deploy/
- scans ${jboss.server.url}/deploy/, which is local or remote
- depending on the URL used to boot the server
- ${jboss.server.home}/deploy/
- scans ${jboss.server.home)/deploy, which is always local
- file:/var/opt/myapp.ear
- deploy myapp.ear from a local location
- file:/var/opt/apps/
- scans the specified directory
- http://www.test.com/netboot/myapp.ear
- deploys myapp.ear from a remote location
- http://www.test.com/netboot/apps/
- scans the specified WebDAV location
- -->
- <attribute name="URLs">
- deploy/
- </attribute>
-
- <!-- Indicates if the scanner should recursively scan directories that
- contain no "." in their names. This can be used to group applications
- and services that must be deployed and that have the same
- logical function in the same directory i.e.
- deploy/JMX/
- deploy/JMS/
- ...
- -->
- <attribute name="RecursiveSearch">True</attribute>
-
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jbossjta-properties.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jbossjta-properties.xml
deleted file mode 100644
index 0ed4922..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jbossjta-properties.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<transaction-service>
- <properties depends="common" name="arjuna">
- <!--
- Transaction Reaper Timeout (default is 120000 microseconds).
- -->
- <property
- name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/>
- <!--
- Transaction Reaper Mode, can be: NORMAL or DYNAMIC (default is NORMAL).
- -->
- <property name="com.arjuna.ats.arjuna.coordinator.txReaperMode" value="NORMAL"/>
- <!--
- (default is NO)
- -->
- <property name="com.arjuna.ats.arjuna.coordinator.asyncCommit" value="NO"/>
- <!--
- (default is NO)
- -->
- <property name="com.arjuna.ats.arjuna.coordinator.asyncPrepare" value="NO"/>
- <!--
- (default is YES)
- -->
- <property
- name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/>
- <!--
- (default is defaultStore)
- -->
- <property name="com.arjuna.ats.arjuna.objectstore.localOSRoot" value="defaultStore"/>
- <!--
- default is under user.home - must be writeable!)
- -->
- <property
- name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="PutObjectStoreDirHere"/>
- <!--
- (default is ON)
- -->
- <property
- name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/>
- <!--
- (default is ShadowNoFileLockStore)
- -->
-
- <!-- RHQ - ObjectStores -->
- <!-- http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/
- 4.2.0.cp05/html/JBoss_TS_Programmers_Guide/Persistent_object_stores.html -->
- <property
- name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/>
- <!--
- <property name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="CachedStore"/>
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.hash" value="128" />
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.size" value="250000" />
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.removedItems" value="256" />
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.workItems" value="100" />
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.scanPeriod" value="120000" />
- <property name="com.arjuna.ats.internal.arjuna.objectstore.cacheStore.sync" value="OFF" />
- -->
-
- <!--
- (default is 255)
- -->
- <property
- name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/>
- <!--
- (default is ON)
- -->
- <property
- name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/>
- <!--
- (Must be unique across all Arjuna instances.)
- -->
- <property name="com.arjuna.ats.arjuna.xa.nodeIdentifier" value="1"/>
- <!-- property
- name="com.arjuna.ats.arjuna.coordinator.actionStore"
- value="HashedActionStore"
- value="JDBCActionStore"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.jdbcTxDbAccess"
- value="JDBCAccess"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.objectStoreType"
- value="ShadowNoFileLockStore"
- value="JDBCStore"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.jdbcUserDbAccess"
- value="JDBCAccess"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeInitial"
- value="1"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.jdbcPoolSizeMaximum"
- value="1"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.objectstore.jdbcPoolPutConnections"
- value="false"
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.size"
- value=""
- -->
- <!-- property
- name="com.arjuna.ats.arjuna.internal.arjuna.objectstore.cacheStore.period"
- value=""
- -->
- <!--
- The location for creating temporary files, e.g., Uids.
- Default is under user.home.
- IMPORTANT: make sure the directory is lockable, e.g., /tmp on Unix
- may not be!
- -->
- <!--
- <property
- name="com.arjuna.ats.arjuna.common.varDir"
- value="var"/>
- -->
- </properties>
- <properties name="common">
- <!-- CLF 2.0 properties -->
- <property name="com.arjuna.common.util.logging.DebugLevel"
- type="System" value="0x00000000"/>
- <property name="com.arjuna.common.util.logging.FacilityLevel"
- type="System" value="0xffffffff"/>
- <property name="com.arjuna.common.util.logging.VisibilityLevel"
- type="System" value="0xffffffff"/>
- <property name="com.arjuna.common.util.logger" type="System" value="log4j"/>
- </properties>
- <properties depends="arjuna" name="txoj">
- <!--
- (default is LockStore of installation - must be writeable!)
- -->
- <!--
- <property
- name="com.arjuna.ats.txoj.lockstore.lockStoreDir"
- value="LockStore"/>
- -->
- <!--
- (default is BasicLockStore)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.lockStoreType" value="BasicLockStore"/>
- <!--
- (default is NO)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.multipleLockStore" value="NO"/>
- <!--
- (default is YES)
- -->
- <property name="com.arjuna.ats.txoj.lockstore.singleLockStore" value="YES"/>
- <!--
- (default is YES)
- -->
- <property
- name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/>
- </properties>
- <properties depends="arjuna" name="jta">
- <!--
- Support subtransactions in the JTA layer?
- Default is NO.
- -->
- <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/>
- <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/>
- <!--
- com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple
- -->
- <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/>
- <!--
- com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
- -->
-
- <!-- RHQ - add the ability to recover our transactions -->
- <property name="com.arjuna.ats.jta.recovery.XAResourceRecoveryJDBC" value="org.rhq.jbossatx.jta.recovery.AppServerJDBCXARecovery;RHQDS"/>
- <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
- </properties>
- <properties depends="arjuna,txoj,jta" name="recoverymanager">
- <!--
- Properties used only by the RecoveryManager.
- -->
- <!--
- Periodic recovery settings.
- Time values in this section are in seconds.
- -->
- <!--
- Interval in seconds between initiating the periodic recovery modules.
- Default is 120 seconds.
- -->
- <!-- RHQ - do not check pending transactions very often -->
- <property
- name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="900"/>
- <!--
- Interval in seconds between first and second pass of periodic recovery.
- Default is 10 seconds.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/>
- <!--
- Periodic recovery modules to use. Invoked in sort-order of names.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/>
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/>
- <property
- name="com.arjuna.ats.arjuna.recovery.recoveryExtension3" value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/>
- <!--
- Expired entry removal
- -->
- <!--
- Expiry scanners to use (order of invocation is random).
- Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner"
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/>
- <!--
- Interval, in hours, between running the expiry scanners.
- This can be quite long. The absolute value determines the interval -
- if the value is negative, the scan will NOT be run until after one
- interval has elapsed. If positive the first scan will be immediately
- after startup. Zero will prevent any scanning.
- Default = 12 = run immediately, then every 12 hours.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/>
- <!--
- Age, in hours, for removal of transaction status manager item.
- This should be longer than any ts-using process will remain running.
- Zero = Never removed. Default is 12.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/>
- <!--
- Use this to fix the port on which the TransactionStatusManager listens,
- The default behaviour is to use any free port.
- -->
- <property
- name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/>
- </properties>
- <properties depends="jta" name="jdbc">
- <!--
- property name="com.arjuna.ats.jdbc.isolationLevel" value="TRANSACTION_SERIALIZABLE"/>
- -->
- </properties>
-</transaction-service>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/logging.properties b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/logging.properties
deleted file mode 100644
index f697387..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/logging.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-# =====================================================================
-# RHQ Server JDK Logging Configuration
-# =====================================================================
-
-# Properties file which configures the operation of the JDK logging
-# facility. This allows us to configure logging for 3rd-party libraries
-# that do not use Commons Logging or Log4J (e.g. the JSF RI and
-# Facelets).
-
-# The system will look for this config file, first using a System
-# property specified at startup, e.g.:
-#
-# >java -Djava.util.logging.config.file=myLoggingConfigFilePath
-#
-# If this property is not specified, then the config file is retrieved
-# from its default location at:
-#
-# JDK_HOME/jre/lib/logging.properties
-
-# Global Logging Properties
-# ------------------------------------------
-# The set of handlers to be loaded upon startup. Comma-separated list of class names.
-# (? LogManager docs say no comma here, but JDK example has comma.)
-handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level. Loggers and Handlers may override this level.
-# For list of defined levels, see http://java.sun.com/j2se/1.5.0/docs/api/java/util/logging/Level.html
-.level = INFO
-
-# Loggers
-# ------------------------------------------
-# Here, the level for each logger is specified. Loggers are usually,
-# though not always, attached to packages. The global level is used by
-# default, so levels specified here simply act as overrides.
-
-# JSF API (i.e. javax.faces.*)
-javax.faces.level = WARNING
-
-# NOTE: JSF RI (i.e. com.sun.faces.*) logging should be configured via jboss-log4j.xml.
-# (see http://wiki.jboss.org/wiki/JBossFacesLogging)
-#javax.enterprise.resource.webcontainer.jsf.level = WARNING
-
-# Facelets (i.e. com.sun.facelets.*)
-facelets.level = WARNING
-
-# Handlers
-# -----------------------------------------
-
-# ===== ConsoleHandler =====
-# For syntax, see http://java.sun.com/j2se/1.5.0/docs/api/java/util/logging/ConsoleHandler....
-
-# Override of global logging level
-java.util.logging.ConsoleHandler.level = SEVERE
-
-# Style of output (Simple or XML):
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-# ===== FileHandler =====
-# For syntax, see http://java.sun.com/j2se/1.5.0/docs/api/java/util/logging/FileHandler.html
-
-# Override of global logging level
-java.util.logging.FileHandler.level = WARNING
-
-# Style of output (simple or XML):
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-# Output file path:
-# i.e.: /home/rhq-server.log
-# we use ../.. because we normally run out of the /jbossas/bin directory and our logs are at /logs
-java.util.logging.FileHandler.pattern = ../../logs/rhq-server-jdklog.log
-
-# Limit on size of output file, in bytes:
-java.util.logging.FileHandler.limit = 5000000
-
-# Number of output files to cycle through, by appending an
-# integer to the base file name:
-java.util.logging.FileHandler.count = 1
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml
deleted file mode 100644
index 824d9a3..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC "-//JBoss//DTD JBOSS Security Config 3.0//EN" "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<policy>
- <!-- Used by clients within the application server VM such as
- mbeans and servlets that access EJBs.
- -->
- <application-policy name = "client-login">
- <authentication>
- <login-module code = "org.jboss.security.ClientLoginModule" flag = "required">
- <!-- Any existing security context will be restored on logout -->
- <module-option name="restore-login-identity">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- Policy for REST. This allows to have the servlet-ejb-container integration to forward the authenticated JEE
- Subject to be forwarded to the EJB layer -->
- <application-policy name="REST">
- <authentication>
- <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
- <module-option name = "dsJndiName">java:/RHQDS</module-option>
- <module-option name = "principalsQuery">SELECT PASSWORD FROM RHQ_PRINCIPAL WHERE principal=?</module-option>
- <module-option name = "rolesQuery">SELECT 'all', 'Roles' FROM RHQ_PRINCIPAL WHERE principal=?</module-option>
- <module-option name = "hashAlgorithm">MD5</module-option>
- <module-option name = "hashEncoding">base64</module-option>
- </login-module>
- </authentication>
-
- </application-policy>
-
-
-<!-- security domains for encrypted dataseouce passwords -->
- <application-policy name = "XADSRealm">
- <authentication>
- <login-module code = "org.jboss.resource.security.SecureIdentityLoginModule"
- flag = "required">
- <module-option name = "username">${rhq.server.database.user-name}</module-option>
- <module-option name = "password">${rhq.server.database.password}</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=XATxCM,name=RHQDS</module-option>
- </login-module>
- </authentication>
- </application-policy>
- <application-policy name = "NONXADSRealm">
- <authentication>
- <login-module code = "org.jboss.resource.security.SecureIdentityLoginModule"
- flag = "required">
- <module-option name = "username">${rhq.server.database.user-name}</module-option>
- <module-option name = "password">${rhq.server.database.password}</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=NoTxCM,name=NoTxRHQDS</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <!-- Security domain for JBossMQ -->
- <application-policy name = "jbossmq">
- <authentication>
- <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
- <module-option name = "unauthenticatedIdentity">guest</module-option>
- <module-option name = "dsJndiName">java:/RHQDS</module-option>
- <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
- <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "JmsXARealm">
- <authentication>
- <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" flag = "required">
- <module-option name = "principal">guest</module-option>
- <module-option name = "userName">guest</module-option>
- <module-option name = "password">guest</module-option>
- <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
-</policy>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cache-invalidation-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cache-invalidation-service.xml
deleted file mode 100644
index 6331cb4..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cache-invalidation-service.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-<!-- $Id: cache-invalidation-service.xml 16662 2003-08-27 04:38:22Z patriot1burke $ -->
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Cache Invalidation Service -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <mbean code="org.jboss.cache.invalidation.InvalidationManager"
- name="jboss.cache:service=InvalidationManager">
- </mbean>
-
-
-<!--
- Uncomment if you want to activate the cache invalidation mechanism accross
- nodes using the JMS bridge
-
- PropagationMode can be : IN_OUT = 1, IN_ONLY = 2, OUT_ONLY = 3
-
- You can also set the ProviderUrl attribute to another IP:port setting if you
- must lookup your JMS information in other JMS trees i.e.
-
- <attribute name="ProviderUrl">MyOtherNode:1099</attribute>
-
--->
-<!--
- <mbean code="org.jboss.mq.server.jmx.Topic"
- name="jboss.mq.destination:service=Topic,name=JMSCacheInvalidationBridge">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends>
- </mbean>
-
- <mbean code="org.jboss.cache.invalidation.bridges.JMSCacheInvalidationBridge"
- name="jboss.cache:service=InvalidationBridge,type=JavaGroups">
- <depends>jboss.cache:service=InvalidationManager</depends>
- <depends>jboss.mq.destination:service=Topic,name=JMSCacheInvalidationBridge</depends>
- <attribute name="InvalidationManager">jboss.cache:service=InvalidationManager</attribute>
- <attribute name="ConnectionFactoryName">java:/ConnectionFactory</attribute>
- <attribute name="TopicName">topic/JMSCacheInvalidationBridge</attribute>
- <attribute name="PropagationMode">1</attribute>
- </mbean>
--->
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cluster-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cluster-service.xml
deleted file mode 100644
index 0b7c78e..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/cluster-service.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Sample Clustering Service Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Cluster Partition: defines cluster -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ha.framework.server.ClusterPartition"
- name="jboss:service=${jboss.partition.name:DefaultPartition}">
-
- <!-- Name of the partition being built -->
- <attribute name="PartitionName">${jboss.partition.name:DefaultPartition}</attribute>
-
- <!-- The address used to determine the node name -->
- <attribute name="NodeAddress">${jgroups.bind_addr}</attribute>
-
- <!-- Determine if deadlock detection is enabled -->
- <attribute name="DeadlockDetection">False</attribute>
-
- <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
- <attribute name="StateTransferTimeout">30000</attribute>
-
- <!-- The JGroups protocol configuration -->
- <attribute name="PartitionConfig">
- <!--
- The default UDP stack:
- - If you have a multihomed machine, set the UDP protocol's bind_addr attribute to the
- appropriate NIC IP address, e.g bind_addr="192.168.0.2".
- - On Windows machines, because of the media sense feature being broken with multicast
- (even after disabling media sense) set the UDP protocol's loopback attribute to true
- -->
- <Config>
- <UDP mcast_addr="${jgroups.udp.mcast_addr:230.1.2.3}"
- mcast_port="${jboss.hapartition.mcast_port:45566}"
- bind_addr="${jgroups.bind_addr}"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="${rhq.server.startup.partition.udpLoopback:false}"
- discard_incompatible_packets="true"
- enable_bundling="false"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- down_thread="false" up_thread="false"/>
- <PING timeout="2000"
- down_thread="false" up_thread="false" num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- down_thread="false" up_thread="false" min_interval="20000"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"
- down_thread="false" up_thread="false"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- down_thread="false" up_thread="false"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- down_thread="false" up_thread="false"
- join_retry_timeout="2000" shun="true"
- view_bundling="true"/>
- <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
- <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
- </Config>
-
- <!-- Alternate TCP stack: customize it for your environment, change bind_addr and initial_hosts -->
- <!--
- <Config>
- <TCP bind_addr="thishost" start_port="7800" loopback="true"
- tcp_nodelay="true"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- enable_bundling="false"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- use_outgoing_packet_handler="false"
- down_thread="false" up_thread="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"/>
- <TCPPING initial_hosts="thishost[7800],otherhost[7800]" port_range="3"
- timeout="3000"
- down_thread="false" up_thread="false"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- down_thread="false" up_thread="false" min_interval="20000"/>
- <FD_SOCK down_thread="false" up_thread="false"/>
- <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
- <pbcast.NAKACK max_xmit_size="60000"
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- down_thread="false" up_thread="false"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- down_thread="false" up_thread="false"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- down_thread="false" up_thread="false"
- join_retry_timeout="2000" shun="true"
- view_bundling="true"/>
- <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
- </Config>
- -->
- </attribute>
- <depends>jboss:service=Naming</depends>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- HA Session State Service for SFSB -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ha.hasessionstate.server.HASessionStateService"
- name="jboss:service=HASessionState">
- <depends>jboss:service=Naming</depends>
- <!-- We now inject the partition into the HAJNDI service instead
- of requiring that the partition name be passed -->
- <depends optional-attribute-name="ClusterPartition"
- proxy-type="attribute">jboss:service=${jboss.partition.name:DefaultPartition}</depends>
- <!-- JNDI name under which the service is bound -->
- <attribute name="JndiName">/HASessionState/Default</attribute>
- <!-- Max delay before cleaning unreclaimed state.
- Defaults to 30*60*1000 => 30 minutes -->
- <attribute name="BeanCleaningDelay">0</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- HA JNDI -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.ha.jndi.HANamingService"
- name="jboss:service=HAJNDI">
- <!-- We now inject the partition into the HAJNDI service instead
- of requiring that the partition name be passed -->
- <depends optional-attribute-name="ClusterPartition"
- proxy-type="attribute">jboss:service=${jboss.partition.name:DefaultPartition}</depends>
- <!-- Bind address of bootstrap and HA-JNDI RMI endpoints -->
- <attribute name="BindAddress">${jboss.bind.address}</attribute>
- <!-- Port on which the HA-JNDI stub is made available -->
- <attribute name="Port">${rhq.server.startup.hajndi.port:1100}</attribute>
- <!-- RmiPort to be used by the HA-JNDI service once bound. 0 => auto. -->
- <attribute name="RmiPort">${rhq.server.startup.hajndi.rmiport:1101}</attribute>
- <!-- Accept backlog of the bootstrap socket -->
- <attribute name="Backlog">50</attribute>
- <!-- The thread pool service used to control the bootstrap and
- auto discovery lookups -->
- <depends optional-attribute-name="LookupPool"
- proxy-type="attribute">jboss.system:service=ThreadPool</depends>
-
- <!-- A flag to disable the auto discovery via multicast -->
- <attribute name="DiscoveryDisabled">false</attribute>
- <!-- Set the auto-discovery bootstrap multicast bind address. If not
- specified and a BindAddress is specified, the BindAddress will be used. -->
- <attribute name="AutoDiscoveryBindAddress">${jgroups.bind_addr}</attribute>
- <!-- Multicast Address and group port used for auto-discovery -->
- <attribute name="AutoDiscoveryAddress">${jgroups.udp.mcast_addr:230.1.2.3}</attribute>
- <attribute name="AutoDiscoveryGroup">${rhq.server.startup.hajndi.autodiscoverygroupport:1102}</attribute>
- <!-- The TTL (time-to-live) for autodiscovery IP multicast packets -->
- <attribute name="AutoDiscoveryTTL">16</attribute>
- <!-- The load balancing policy for HA-JNDI -->
- <attribute name="LoadBalancePolicy">org.jboss.ha.framework.interfaces.RoundRobin</attribute>
-
- <!-- Client socket factory to be used for client-server
- RMI invocations during JNDI queries
- <attribute name="ClientSocketFactory">custom</attribute>
- -->
- <!-- Server socket factory to be used for client-server
- RMI invocations during JNDI queries
- <attribute name="ServerSocketFactory">custom</attribute>
- -->
- </mbean>
-
- <!-- ==================================================================== -->
- <!-- HA Invokers -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.invocation.unified.server.UnifiedInvokerHA"
- name="jboss:service=invoker,type=unifiedha">
- <depends>jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="Connector"
- proxy-type="attribute">jboss.remoting:service=Connector,transport=socket</depends>
- <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
- </mbean>
-
- <mbean code="org.jboss.invocation.jrmp.server.JRMPInvokerHA"
- name="jboss:service=invoker,type=jrmpha">
- <attribute name="ServerAddress">${jboss.bind.address}</attribute>
- <attribute name="RMIObjectPort">${rhq.server.startup.hajrmpinvoker.rmiport:4447}</attribute>
- <!--
- <attribute name="RMIClientSocketFactory">custom</attribute>
- <attribute name="RMIServerSocketFactory">custom</attribute>
- -->
- <depends>jboss:service=Naming</depends>
- </mbean>
-
- <!-- the JRMPInvokerHA creates a thread per request. This implementation uses a pool of threads -->
- <mbean code="org.jboss.invocation.pooled.server.PooledInvokerHA"
- name="jboss:service=invoker,type=pooledha">
- <attribute name="NumAcceptThreads">1</attribute>
- <attribute name="MaxPoolSize">300</attribute>
- <attribute name="ClientMaxPoolSize">300</attribute>
- <attribute name="SocketTimeout">60000</attribute>
- <attribute name="ServerBindAddress">${jboss.bind.address}</attribute>
- <attribute name="ServerBindPort">${rhq.server.startup.hapooledinvoker.port:4448}</attribute>
- <attribute name="ClientConnectAddress">${jboss.bind.address}</attribute>
- <attribute name="ClientConnectPort">0</attribute>
- <attribute name="EnableTcpNoDelay">false</attribute>
- <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
- <depends>jboss:service=Naming</depends>
- </mbean>
-
- <!-- ==================================================================== -->
-
- <!-- ==================================================================== -->
- <!-- Distributed cache invalidation -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridge"
- name="jboss.cache:service=InvalidationBridge,type=JavaGroups">
- <!-- We now inject the partition into the HAJNDI service instead
- of requiring that the partition name be passed -->
- <depends optional-attribute-name="ClusterPartition"
- proxy-type="attribute">jboss:service=${jboss.partition.name:DefaultPartition}</depends>
- <depends>jboss.cache:service=InvalidationManager</depends>
- <attribute name="InvalidationManager">jboss.cache:service=InvalidationManager</attribute>
- <attribute name="BridgeName">DefaultJGBridge</attribute>
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb-deployer.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb-deployer.xml
deleted file mode 100644
index 6d75316..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb-deployer.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- The JBoss service configuration file for the EJB deployer service.
-
- $Id$
--->
-<server>
-
- <!-- ==================================================================== -->
- <!-- J2EE Timer Service -->
- <!-- ==================================================================== -->
-
- <!-- An EJB Timer Service that is Tx aware -->
- <mbean code="org.jboss.ejb.txtimer.EJBTimerServiceImpl"
- name="jboss.ejb:service=EJBTimerService">
- <attribute name="RetryPolicy">jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay</attribute>
- <attribute name="PersistencePolicy">jboss.ejb:service=EJBTimerService,persistencePolicy=noop</attribute>
- <attribute name="TimerIdGeneratorClassName">org.jboss.ejb.txtimer.BigIntegerTimerIdGenerator</attribute>
- <attribute name="TimedObjectInvokerClassName">org.jboss.ejb.txtimer.TimedObjectInvokerImpl</attribute>
- <depends optional-attribute-name="TransactionManagerFactory" proxy-type="org.jboss.tm.TransactionManagerFactory">
- jboss:service=TransactionManager
- </depends>
- </mbean>
-
- <!-- A retry policy that uses a fixed interval in milli seconds -->
- <mbean code="org.jboss.ejb.txtimer.FixedDelayRetryPolicy" name="jboss.ejb:service=EJBTimerService,retryPolicy=fixedDelay">
- <attribute name="Delay">100</attribute>
- </mbean>
-
- <!-- A persistence policy that does not persist the timers -->
- <mbean code="org.jboss.ejb.txtimer.NoopPersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=noop"/>
-
- <!--
- A persistence policy that persists timers to a database.
-
- The 2 supported db persistence plugins are:
- org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin
- org.jboss.ejb.txtimer.OracleDatabasePersistencePlugin
-
- The table name defaults to "TIMERS". It can be overriden using the
- 'TimersTable' attribute if the persistence plugin supports it.
- When overriding the timers table, an optional schema can be specified
- using the syntax [schema.]table
- -->
- <!--
- <mbean code="org.jboss.ejb.txtimer.DatabasePersistencePolicy" name="jboss.ejb:service=EJBTimerService,persistencePolicy=database">
- <depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
- <attribute name="DatabasePersistencePlugin">org.jboss.ejb.txtimer.GeneralPurposeDatabasePersistencePlugin</attribute>
- <attribute name="TimersTable">TIMERS</attribute>
- </mbean>
- -->
-
- <!-- ==================================================================== -->
- <!-- EJB Deployer -->
- <!-- ==================================================================== -->
-
- <!-- EJB deployer, remove to disable EJB behavior-->
- <mbean code="org.jboss.ejb.EJBDeployer" name="jboss.ejb:service=EJBDeployer" xmbean-dd="">
-
- <!-- Inline XMBean Descriptor BEGIN -->
- <xmbean>
- <description>The EJBDeployer responsible for ejb jar deployment</description>
- <descriptors>
- <interceptors>
- <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
- <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
- </interceptors>
- </descriptors>
- <class>org.jboss.ejb.EJBDeployer</class>
-
- <!-- ServiceMBean attributes -->
- <attribute access="read-only" getMethod="getName">
- <description>The class name of the MBean</description>
- <name>Name</name>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getState">
- <description>The status of the MBean</description>
- <name>State</name>
- <type>int</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getStateString">
- <description>The status of the MBean in text form</description>
- <name>StateString</name>
- <type>java.lang.String</type>
- </attribute>
-
- <!-- SubDeployerMBean attributes -->
- <attribute access="read-only" getMethod="getServiceName">
- <description>The JMX ObjectName of the service that provides the SubDeployer</description>
- <name>ServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getSuffixes">
- <description>An array of suffixes of interest to this subdeployer</description>
- <name>Suffixes</name>
- <type>[Ljava.lang.String;</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getRelativeOrder">
- <description>The relative order of the specified suffixes</description>
- <name>RelativeOrder</name>
- <type>int</type>
- </attribute>
-
- <!-- SubDeployerExtMBean attribute -->
- <attribute access="read-write" getMethod="getEnhancedSuffixes" setMethod="setEnhancedSuffixes">
- <description>Allow the override of supported suffixes and relative order</description>
- <name>EnhancedSuffixes</name>
- <type>[Ljava.lang.String;</type>
- </attribute>
-
- <!-- EJBDeployerMBean attributes -->
- <attribute access="read-write" getMethod="getWebServiceName" setMethod="setWebServiceName">
- <description>The dynamic class loading simple web server</description>
- <name>WebServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getVerifyDeployments" setMethod="setVerifyDeployments">
- <description>Control the bean verifier (on/off)</description>
- <name>VerifyDeployments</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getVerifierVerbose" setMethod="setVerifierVerbose">
- <description>Control the verbose mode of the bean verifier</description>
- <name>VerifierVerbose</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getStrictVerifier" setMethod="setStrictVerifier">
- <description>Control the strictness of the bean verifier</description>
- <name>StrictVerifier</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="isCallByValue" setMethod="setCallByValue">
- <description>Enable/disable call-by-value semantics</description>
- <name>CallByValue</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getValidateDTDs" setMethod="setValidateDTDs">
- <description>Enable/disable the validation of deployment descriptors</description>
- <name>ValidateDTDs</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="isMetricsEnabled" setMethod="setMetricsEnabled">
- <description>Enable/disable the metrics interceptor for containers</description>
- <name>MetricsEnabled</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getTransactionManagerServiceName" setMethod="setTransactionManagerServiceName">
- <description>The transaction manager service to use</description>
- <name>TransactionManagerServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <!-- EJBDeployerMBean operations -->
- <operation>
- <description>List the deployed applications</description>
- <name>listDeployedApplications</name>
- <return-type>java.util.Iterator</return-type>
- </operation>
-
- <!-- ServiceMBean operations -->
- <operation>
- <description>Standard MBean lifecycle method</description>
- <name>create</name>
- </operation>
-
- <operation>
- <description>The start lifecycle operation</description>
- <name>start</name>
- </operation>
-
- <operation>
- <description>The stop lifecycle operation</description>
- <name>stop</name>
- </operation>
-
- <operation>
- <description>The destroy lifecycle operation</description>
- <name>destroy</name>
- </operation>
-
- <operation>
- <description>The detyped lifecycle operation (for internal use only)</description>
- <name>jbossInternalLifecycle</name>
- <parameter>
- <description>The lifecycle operation</description>
- <name>method</name>
- <type>java.lang.String</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
-
- <!-- SubDeployerMBean operations -->
- <operation>
- <description>Accept a module for deployment</description>
- <name>accepts</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- <return-type>boolean</return-type>
- </operation>
-
- <operation>
- <description>Initialize deployment step</description>
- <name>init</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Create deployment step</description>
- <name>create</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Start deployment step</description>
- <name>start</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Stop deployment step</description>
- <name>stop</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Destroy deployment step</description>
- <name>destroy</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <!-- Interceptable operations -->
- <operation>
- <description>Add dynamically an operation interceptor</description>
- <name>addOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Remove dynamically an operation interceptor</description>
- <name>removeOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
- </xmbean>
- <!-- Inline XMBean Descriptor END -->
-
- <!-- A flag indicating if the deployer should validate the
- ejb-jar.xml/jboss.xml descriptors and components
- -->
- <attribute name="VerifyDeployments">true</attribute>
- <!-- A flag indicating if the xml parser should validate the descriptor
- DTDs
- -->
- <attribute name="ValidateDTDs">false</attribute>
- <!-- A flag indicating if the verifier should be verbose about its
- operation
- -->
- <attribute name="VerifierVerbose">true</attribute>
- <!-- Setting this to 'true' will cause all deployments
- to fail when the Verifier detected a problem with the contained
- Beans. If false, warnings/errors will be logged but the deployment
- will not fail.
- -->
- <attribute name="StrictVerifier">true</attribute>
-
- <!-- The EJBDeployer needs the JTA transaction manager service -->
- <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
- <!-- The dynamic class loading simple web server -->
- <depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends>
-
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3-entity-cache-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3-entity-cache-service.xml
deleted file mode 100644
index 1a7df11..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3-entity-cache-service.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <!-- ============================================================ -->
- <!-- Clustered entity cache config for use with JBoss Cache 1.4.x -->
- <!-- ============================================================ -->
- <mbean code="org.jboss.cache.TreeCache"
- name="jboss.cache:service=EJB3EntityTreeCache">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
-
- <!-- Name of cluster. Needs to be the same on all nodes in the clusters,
- in order to find each other -->
- <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-EntityCache</attribute>
-
- <!-- Configure the TransactionManager -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-
- <!--
- Node locking level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!-- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Must be true if any entity deployment uses a scoped classloader -->
- <attribute name="UseRegionBasedMarshalling">true</attribute>
- <!-- Must match the value of "useRegionBasedMarshalling" -->
- <attribute name="InactiveOnStartup">true</attribute>
-
- <!-- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members.
- -->
- <attribute name="InitialStateRetrievalTimeout">17500</attribute>
-
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">17500</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">15000</attribute>
-
- <!-- Name of the eviction policy class. -->
- <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">5</attribute>
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- </config>
- </attribute>
-
- </mbean>
-
-</server>
-
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml
deleted file mode 100644
index 4e9bc3e..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/jboss-service.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss EJB3Deployer
-
- $Id$
--->
-<server>
-
- <!-- do not expose the EJB3 beans using the built-in way - we'll do it our own way using remote-api-service.xml -->
- <!--
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="InvokerLocator">socket://${jboss.bind.address}:${rhq.server.startup.aspectdeployer.bind-port:3873}</attribute>
- <attribute name="Configuration">
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </attribute>
- </mbean>
- -->
-
- <!-- The following is sample configuration for modifying the Connector
- <mbean code="org.jboss.remoting.transport.Connector"
- name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
- <depends>jboss.aop:service=AspectDeployer</depends>
- <attribute name="Configuration">
- <config>
- <invoker transport="socket">
- <attribute name="numAcceptThreads">1</attribute>
- <attribute name="maxPoolSize">300</attribute>
- <attribute name="clientMaxPoolSize" isParam="true">50</attribute>
- <attribute name="timeout" isParam="true">60000</attribute>
- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
- <attribute name="serverBindPort">3873</attribute>
- <attribute name="backlog">200</attribute>
- </invoker>
- <handlers>
- <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
- </handlers>
- </config>
- </attribute>
- </mbean-->
-
- <mbean code="org.jboss.ejb3.JarsIgnoredForScanning" name="jboss.ejb3:service=JarsIgnoredForScanning">
- <attribute name="IgnoredJars">
- snmp-adaptor.jar,
- otherimages.jar,
- applet.jar,
- jcommon.jar,
- console-mgr-classes.jar,
- jfreechart.jar,
- juddi-service.jar,
- commons-collections.jar,
- commons-pool.jar,
- juddi.jar,
- commons-discovery.jar,
- uddi4j.jar,
- axis.jar,
- commons-dbcp.jar,
- jboss-juddiaxis.jar,
- trove.jar,
- javassist.jar,
- jboss-aop-jdk50.jar,
- jboss-aspect-library-jdk50.jar,
- ejb3-persistence.jar,
- commons-validator-1.1.3.jar,
- commons-collections.jar,
- commons-fileupload.jar,
- commons-pool.jar,
- hibernate-entitymanager.jar,
- jboss-ejb3x.jar,
- commons-digester-1.6.jar,
- cglib-2.1.1.jar,
- commons-discovery.jar,
- jboss-annotations-ejb3.jar,
- jaxen-1.1-beta-4.jar,
- hibernate-annotations.jar,
- commons-httpclient.jar,
- commons-logging.jar,
- commons-vfs.jar,
- hibernate3.jar,
- commons-logging-api.jar,
- asm.jar,
- asm-attrs.jar,
- commons-lang-2.0.jar,
- commons-beanutils.jar,
- jboss-ejb3.jar,
- dom4j.jar,
- commons-codec-1.2.jar,
- xmlsec.jar,
- jboss-bean-deployer.jar,
- jboss-microcontainer.jar,
- jboss-dependency.jar,
- jboss-container.jar,
- tomcat-coyote.jar,
- commons-collections.jar,
- myfaces.jar,
- jstl.jar,
- commons-digester-1.6.jar,
- myfaces-impl.jar,
- commons-beanutils.jar,
- myfaces-jsf-api.jar,
- commons-codec-1.2.jar,
- catalina-optional.jar,
- tomcat-util.jar,
- jasper-compiler.jar,
- commons-el.jar,
- jasper-compiler-jdt.jar,
- tomcat-http.jar,
- catalina-manager.jar,
- jasper-runtime.jar,
- tomcat55-service.jar,
- servlets-invoker.jar,
- catalina.jar,
- naming-resources.jar,
- servlets-default.jar,
- tomcat-ajp.jar,
- commons-modeler.jar,
- tomcat-apr.jar,
- servlets-webdav.jar
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" xmbean-dd="">
-
- <attribute name="DeployEjb3ExtensionOnly">false</attribute>
-
- <!-- Inline XMBean Descriptor BEGIN -->
- <xmbean>
- <description>The EJB3Deployer responsible for ejb3 deployment</description>
- <descriptors>
- <interceptors>
- <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
- <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
- </interceptors>
- </descriptors>
- <class>org.jboss.ejb3.EJB3Deployer</class>
-
- <!-- ServiceMBean attributes -->
- <attribute access="read-only" getMethod="getName">
- <description>The class name of the MBean</description>
- <name>Name</name>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getState">
- <description>The status of the MBean</description>
- <name>State</name>
- <type>int</type>
- </attribute>
-
- <attribute access="read-only" getMethod="getStateString">
- <description>The status of the MBean in text form</description>
- <name>StateString</name>
- <type>java.lang.String</type>
- </attribute>
-
- <!-- SubDeployerMBean attributes -->
- <attribute access="read-only" getMethod="getServiceName">
- <description>The ObjectName of the Subdeployer</description>
- <name>ServiceName</name>
- <type>javax.management.ObjectName</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes">
- <description>The suffixes of interest to this deployer</description>
- <name>Suffixes</name>
- <type>[Ljava.lang.String;</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder">
- <description>The relative order of the suffixes in the global suffixes list</description>
- <name>RelativeOrder</name>
- <type>int</type>
- </attribute>
-
- <!-- EJB3DeployerMBean attributes -->
- <attribute access="read-only" getMethod="getDefaultProperties">
- <name>DefaultProperties</name>
- <type>java.util.Properties</type>
- </attribute>
-
- <attribute access="read-write" getMethod="getDeployEjb3ExtensionOnly" setMethod="setDeployEjb3ExtensionOnly">
- <description>If true, .jars will not be examined for annotations, 3.0 descriptors</description>
- <name>DeployEjb3ExtensionOnly</name>
- <type>boolean</type>
- </attribute>
-
- <attribute access="write-only" setMethod="setJarsIgnoredForScanning">
- <description>mbean that has list of jars to ignore</description>
- <name>JarsIgnoredForScanning</name>
- <type>org.jboss.ejb3.JarsIgnoredForScanningMBean</type>
- </attribute>
-
- <!-- ServiceMBean operations -->
- <operation>
- <description>Standard MBean lifecycle method</description>
- <name>create</name>
- </operation>
-
- <operation>
- <description>The start lifecycle operation</description>
- <name>start</name>
- </operation>
-
- <operation>
- <description>The stop lifecycle operation</description>
- <name>stop</name>
- </operation>
-
- <operation>
- <description>The destroy lifecycle operation</description>
- <name>destroy</name>
- </operation>
-
- <operation>
- <description>The detyped lifecycle operation (for internal use only)</description>
- <name>jbossInternalLifecycle</name>
- <parameter>
- <description>The lifecycle operation</description>
- <name>method</name>
- <type>java.lang.String</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
-
- <!-- SubDeployerMBean operations -->
- <operation>
- <description>Accept a module for deployment</description>
- <name>accepts</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- <return-type>boolean</return-type>
- </operation>
-
- <operation>
- <description>Initialize deployment step</description>
- <name>init</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Create deployment step</description>
- <name>create</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Start deployment step</description>
- <name>start</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Stop deployment step</description>
- <name>stop</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Destroy deployment step</description>
- <name>destroy</name>
- <parameter>
- <name>info</name>
- <type>org.jboss.deployment.DeploymentInfo</type>
- </parameter>
- </operation>
-
- <!-- Interceptable operations -->
- <operation>
- <description>Add dynamically an operation interceptor</description>
- <name>addOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
-
- <operation>
- <description>Remove dynamically an operation interceptor</description>
- <name>removeOperationInterceptor</name>
- <parameter>
- <description>The Interceptor</description>
- <name>interceptor</name>
- <type>org.jboss.mx.interceptor.Interceptor</type>
- </parameter>
- </operation>
- </xmbean>
- <!-- Inline XMBean Descriptor END -->
-
- <depends>jboss.aop:service=AspectDeployer</depends>
- <depends>jboss.ejb:service=EJBDeployer</depends>
- <depends optional-attribute-name="JarsIgnoredForScanning" proxy-type="org.jboss.ejb3.JarsIgnoredForScanningMBean">jboss.ejb3:service=JarsIgnoredForScanning</depends>
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/persistence.properties b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/persistence.properties
deleted file mode 100644
index 331a416..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/ejb3.deployer/META-INF/persistence.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-
-# Custom RHQ ejb3 persistence.properties for enterprise server deployment
-
-# Cache settings
-hibernate.cache.use_second_level_cache=false
-hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-hibernate.cache.use_query_cache=false
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/web.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/web.xml
deleted file mode 100644
index 36129f4..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <display-name>Welcome to RHQ</display-name>
- <description>Welcome to RHQ</description>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/index.html b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/index.html
deleted file mode 100644
index f6dda7a..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/ROOT.war/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Welcome!</title>
-
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Expires" content="-1" />
-<meta http-equiv="Cache-control" content="no-cache" />
-
-<script type="text/javascript" language="JavaScript">
-<!--
-window.location = "/installer/welcome.jsf"
-//-->
-</script>
-
-<style type="text/css">
- body {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white; background: #781F1C;
- }
- h1 {
- font-size: 100%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white;
- }
- p {
- font-size: 75%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: white;
- }
- .javascriptWarning {
- font-size: 100%;
- font-family: Verdana, Helvetica, Arial, sans-serif;
- color: red; background: yellow;
- }
-</style>
-
-</head>
-<body>
- <p> </p>
- <h1 align="center">JavaScript is Required!</h1>
- <noscript>
- <p class="javascriptWarning" align="center">THIS WEB CONSOLE REQUIRES YOUR BROWSER TO HAVE JAVASCRIPT ENABLED.<br/>
- YOU WILL NOT BE ABLE TO PROPERLY ACCESS IT UNTIL YOU ENABLE JAVASCRIPT.</p>
- </noscript>
- <p> </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/conf/web.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/conf/web.xml
deleted file mode 100644
index 7ff68c2..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/conf/web.xml
+++ /dev/null
@@ -1,1251 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <!-- ======================== Introduction ============================== -->
- <!-- This document defines default values for *all* web applications -->
- <!-- loaded into this instance of Tomcat. As each application is -->
- <!-- deployed, this file is processed, followed by the -->
- <!-- "/WEB-INF/web.xml" deployment descriptor from your own -->
- <!-- applications. -->
- <!-- -->
- <!-- WARNING: Do not configure application-specific resources here! -->
- <!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
-
- <!-- =========== Common Context Params ================================== -->
- <!-- JBossInjectionProvider provides resource injection for managed beans. -->
- <!-- See JSF 1.2 spec section 5.4 for details. -->
- <context-param>
- <param-name>com.sun.faces.injectionProvider</param-name>
- <param-value>org.jboss.web.jsf.integration.injection.JBossInjectionProvider</param-value>
- </context-param>
-
- <!-- ================== Common filter Configuration ==================== -->
- <filter>
- <filter-name>CommonHeadersFilter</filter-name>
- <filter-class>org.jboss.web.tomcat.filters.ReplyHeaderFilter</filter-class>
- <init-param>
- <param-name>X-Powered-By</param-name>
- <param-value>Servlet 2.4; JBoss-4.2.0.CR2 (build: SVNTag=JBoss_4_2_0_CR2 date=200704160918)/Tomcat-5.5</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>CommonHeadersFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter>
- <filter-name>RhqRtFilter</filter-name>
- <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>RhqRtFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- ================== Common Listener Configuration ==================== -->
- <listener>
- <listener-class>org.jboss.web.tomcat.security.SecurityFlushSessionListener</listener-class>
- </listener>
-
- <!-- Configures JSF for a web application if the javax.faces.webapp.FacesServlet is declared -->
- <!-- in web.xml. -->
- <listener>
- <listener-class>org.jboss.web.jsf.integration.config.JBossJSFConfigureListener</listener-class>
- </listener>
-
- <!-- Listens to all web app lifecycle events so that @PreDestroy can be called on -->
- <!-- JSF managed beans that go out of scope. You can comment this out if you -->
- <!-- don't use JSF or you don't use annotations on your managed beans. -->
- <listener>
- <listener-class>com.sun.faces.application.WebappLifecycleListener</listener-class>
- </listener>
-
-
- <!-- ================== Built In Servlet Definitions ==================== -->
-
-
- <!-- The default servlet for all web applications, that serves static -->
- <!-- resources. It processes all requests that are not mapped to other -->
- <!-- servlets with servlet mappings (defined either here or in your own -->
- <!-- web.xml file. This servlet supports the following initialization -->
- <!-- parameters (default values are in square brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- fileEncoding Encoding to be used to read static resources -->
- <!-- [platform default] -->
- <!-- -->
- <!-- input Input buffer size (in bytes) when reading -->
- <!-- resources to be served. [2048] -->
- <!-- -->
- <!-- listings Should directory listings be produced if there -->
- <!-- is no welcome file in this directory? [false] -->
- <!-- WARNING: Listings for directories with many -->
- <!-- entries can be slow and may consume -->
- <!-- significant proportions of server resources. -->
- <!-- -->
- <!-- output Output buffer size (in bytes) when writing -->
- <!-- resources to be served. [2048] -->
- <!-- -->
- <!-- readonly Is this context "read only", so HTTP -->
- <!-- commands like PUT and DELETE are -->
- <!-- rejected? [true] -->
- <!-- -->
- <!-- readmeFile File name to display with the directory -->
- <!-- contents. [null] -->
- <!-- -->
- <!-- sendfileSize If the connector used supports sendfile, this -->
- <!-- represents the minimal file size in KB for -->
- <!-- which sendfile will be used. Use a negative -->
- <!-- value to always disable sendfile. [48] -->
- <!-- -->
- <!-- For directory listing customization. Checks localXsltFile, then -->
- <!-- globalXsltFile, then defaults to original behavior. -->
- <!-- -->
- <!-- localXsltFile Make directory listings an XML doc and -->
- <!-- pass the result to this style sheet residing -->
- <!-- in that directory. This overrides -->
- <!-- globalXsltFile[null] -->
- <!-- -->
- <!-- globalXsltFile Site wide configuration version of -->
- <!-- localXsltFile This argument is expected -->
- <!-- to be a physical file. [null] -->
- <!-- -->
- <!-- -->
-
- <servlet>
- <servlet-name>default</servlet-name>
- <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>listings</param-name>
- <param-value>false</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
-
- <!-- The "invoker" servlet, which executes anonymous servlet classes -->
- <!-- that have not been defined in a web.xml file. Traditionally, this -->
- <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
- <!-- it to other patterns as well. The extra path info portion of such a -->
- <!-- request must be the fully qualified class name of a Java class that -->
- <!-- implements Servlet (or extends HttpServlet), or the servlet name -->
- <!-- of an existing servlet definition. This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
-
-<!--
- <servlet>
- <servlet-name>invoker</servlet-name>
- <servlet-class>
- org.apache.catalina.servlets.InvokerServlet
- </servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
--->
-
-
- <!-- The JSP page compiler and execution servlet, which is the mechanism -->
- <!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
- <!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- checkInterval If development is false and checkInterval is -->
- <!-- greater than zero, background compilations are -->
- <!-- enabled. checkInterval is the time in seconds -->
- <!-- between checks to see if a JSP page needs to -->
- <!-- be recompiled. [0] -->
- <!-- -->
- <!-- modificationTestInterval -->
- <!-- Causes a JSP (and its dependent files) to not -->
- <!-- be checked for modification during the -->
- <!-- specified time interval (in seconds) from the -->
- <!-- last time the JSP was checked for -->
- <!-- modification. A value of 0 will cause the JSP -->
- <!-- to be checked on every access. -->
- <!-- Used in development mode only. [4] -->
- <!-- -->
- <!-- compiler Which compiler Ant should use to compile JSP -->
- <!-- pages. See the Ant documentation for more -->
- <!-- information. [javac] -->
- <!-- -->
- <!-- classdebuginfo Should the class file be compiled with -->
- <!-- debugging information? [true] -->
- <!-- -->
- <!-- classpath What class path should I use while compiling -->
- <!-- generated servlets? [Created dynamically -->
- <!-- based on the current web application] -->
- <!-- -->
- <!-- development Is Jasper used in development mode? If true, -->
- <!-- the frequency at which JSPs are checked for -->
- <!-- modification may be specified via the -->
- <!-- modificationTestInterval parameter. [true] -->
- <!-- -->
- <!-- enablePooling Determines whether tag handler pooling is -->
- <!-- enabled [true] -->
- <!-- -->
- <!-- fork Tell Ant to fork compiles of JSP pages so that -->
- <!-- a separate JVM is used for JSP page compiles -->
- <!-- from the one Tomcat is running in. [true] -->
- <!-- -->
- <!-- ieClassId The class-id value to be sent to Internet -->
- <!-- Explorer when using <jsp:plugin> tags. -->
- <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
- <!-- -->
- <!-- javaEncoding Java file encoding to use for generating java -->
- <!-- source files. [UTF8] -->
- <!-- -->
- <!-- keepgenerated Should we keep the generated Java source code -->
- <!-- for each page instead of deleting it? [true] -->
- <!-- -->
- <!-- mappedfile Should we generate static content with one -->
- <!-- print statement per input line, to ease -->
- <!-- debugging? [true] -->
- <!-- -->
- <!-- trimSpaces Should white spaces in template text between -->
- <!-- actions or directives be trimmed? [false] -->
- <!-- -->
- <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
- <!-- debugging be suppressed? [false] -->
- <!-- -->
- <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
- <!-- dumped to a file? [false] -->
- <!-- False if suppressSmap is true -->
- <!-- -->
- <!-- genStrAsCharArray Should text strings be generated as char -->
- <!-- arrays, to improve performance in some cases? -->
- <!-- [false] -->
- <!-- -->
- <!-- errorOnUseBeanInvalidClassAttribute -->
- <!-- Should Jasper issue an error when the value of -->
- <!-- the class attribute in an useBean action is -->
- <!-- not a valid bean class? [true] -->
- <!-- -->
- <!-- scratchdir What scratch directory should we use when -->
- <!-- compiling JSP pages? [default work directory -->
- <!-- for the current web application] -->
- <!-- -->
- <!-- xpoweredBy Determines whether X-Powered-By response -->
- <!-- header is added by generated servlet [false] -->
- <!-- -->
- <!-- compilerTargetVM Compiler target VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- compilerSourceVM Compiler source VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- If you wish to use Jikes to compile JSP pages: -->
- <!-- Please see the "Using Jikes" section of the Jasper-HowTo -->
- <!-- page in the Tomcat documentation. -->
-
- <servlet>
- <servlet-name>jsp</servlet-name>
- <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
- <init-param>
- <param-name>fork</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>xpoweredBy</param-name>
- <param-value>false</param-value>
- </init-param>
-
- <!-- Uncomment to use jdk1.5 features in jsp pages -->
- <!-- RHQ: Uncommented. -->
- <init-param>
- <param-name>compilerSourceVM</param-name>
- <param-value>1.5</param-value>
- </init-param>
-
- <!-- Use a custom options class to allow the shared tag lib descriptors
- to be loaded from jars in the tomcat sar conf/tlds directory. The
- standard options implementation can only find taglibs based on the
- class loader classpath.
- -->
- <init-param>
- <param-name>engineOptionsClass</param-name>
- <param-value>org.jboss.web.tomcat.service.jasper.JspServletOptions</param-value>
- </init-param>
- <!-- Specify the jars relative to the jbossweb-tomcat6.sar that should
- be scanned for common tag lib descriptors to include in every war
- deployment.
- -->
- <init-param>
- <description>JSF standard tlds</description>
- <param-name>tagLibJar0</param-name>
- <param-value>jsf-libs/jsf-impl.jar</param-value>
- </init-param>
- <init-param>
- <description>JSTL standard tlds</description>
- <param-name>tagLibJar1</param-name>
- <param-value>jstl.jar</param-value>
- </init-param>
- -->
- <!-- RHQ: Note, we could instead load the JSF RI's impls of the
- standard JSF taglibs here, but, since we're using
- Facelets rather than JSP, there's no point in doing so. -->
-
- <load-on-startup>3</load-on-startup>
- </servlet>
-
-
- <!-- NOTE: An SSI Filter is also available as an alternative SSI -->
- <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
- <!-- -->
- <!-- Server Side Includes processing servlet, which processes SSI -->
- <!-- directives in HTML pages consistent with similar support in web -->
- <!-- servers like Apache. Traditionally, this servlet is mapped to the -->
- <!-- URL pattern "*.shtml". This servlet supports the following -->
- <!-- initialization parameters (default values are in square brackets): -->
- <!-- -->
- <!-- buffered Should output from this servlet be buffered? -->
- <!-- (0=false, 1=true) [0] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- expires The number of seconds before a page with SSI -->
- <!-- directives will expire. [No default] -->
- <!-- -->
- <!-- isVirtualWebappRelative -->
- <!-- Should "virtual" paths be interpreted as -->
- <!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- inputEncoding The encoding to assume for SSI resources if -->
- <!-- one is not available from the resource. -->
- <!-- [Platform default] -->
- <!-- -->
- <!-- outputEncoding The encoding to use for the page that results -->
- <!-- from the SSI processing. [UTF-8] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
-
-<!--
- <servlet>
- <servlet-name>ssi</servlet-name>
- <servlet-class>
- org.apache.catalina.ssi.SSIServlet
- </servlet-class>
- <init-param>
- <param-name>buffered</param-name>
- <param-value>1</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>expires</param-name>
- <param-value>666</param-value>
- </init-param>
- <init-param>
- <param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
- </init-param>
- <load-on-startup>4</load-on-startup>
- </servlet>
--->
-
-
- <!-- Common Gateway Includes (CGI) processing servlet, which supports -->
- <!-- execution of external applications that conform to the CGI spec -->
- <!-- requirements. Typically, this servlet is mapped to the URL pattern -->
- <!-- "/cgi-bin/*", which means that any CGI applications that are -->
- <!-- executed must be present within the web application. This servlet -->
- <!-- supports the following initialization parameters (default values -->
- <!-- are in square brackets): -->
- <!-- -->
- <!-- cgiPathPrefix The CGI search path will start at -->
- <!-- webAppRootDir + File.separator + this prefix. -->
- <!-- [WEB-INF/cgi] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- executable Name of the exectuable used to run the -->
- <!-- script. [perl] -->
- <!-- -->
- <!-- parameterEncoding Name of parameter encoding to be used with -->
- <!-- CGI servlet. -->
- <!-- [System.getProperty("file.encoding","UTF-8")] -->
- <!-- -->
- <!-- passShellEnvironment Should the shell environment variables (if -->
- <!-- any) be passed to the CGI script? [false] -->
- <!-- -->
- <!-- IMPORTANT: To use the CGI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar -->
-
-<!--
- <servlet>
- <servlet-name>cgi</servlet-name>
- <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>cgiPathPrefix</param-name>
- <param-value>WEB-INF/cgi</param-value>
- </init-param>
- <load-on-startup>5</load-on-startup>
- </servlet>
--->
-
-
- <!-- ================ Built In Servlet Mappings ========================= -->
-
-
- <!-- The servlet mappings for the built in servlets defined above. Note -->
- <!-- that, by default, the CGI and SSI servlets are *not* mapped. You -->
- <!-- must uncomment these mappings (or add them to your application's own -->
- <!-- web.xml deployment descriptor) to enable these services -->
-
- <!-- The mapping for the default servlet -->
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
- <!-- The mapping for the invoker servlet -->
-<!--
- <servlet-mapping>
- <servlet-name>invoker</servlet-name>
- <url-pattern>/servlet/*</url-pattern>
- </servlet-mapping>
--->
-
- <!-- The mapping for the JSP servlet -->
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jsp</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jspx</url-pattern>
- </servlet-mapping>
-
- <!-- The mapping for the SSI servlet -->
-<!--
- <servlet-mapping>
- <servlet-name>ssi</servlet-name>
- <url-pattern>*.shtml</url-pattern>
- </servlet-mapping>
--->
-
- <!-- The mapping for the CGI Gateway servlet -->
-
-<!--
- <servlet-mapping>
- <servlet-name>cgi</servlet-name>
- <url-pattern>/cgi-bin/*</url-pattern>
- </servlet-mapping>
--->
-
-
- <!-- ================== Built In Filter Definitions ===================== -->
-
- <!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
- <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
- <!-- -->
- <!-- Server Side Includes processing filter, which processes SSI -->
- <!-- directives in HTML pages consistent with similar support in web -->
- <!-- servers like Apache. Traditionally, this filter is mapped to the -->
- <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will -->
- <!-- selectively enable/disable SSI processing based on mime types. For -->
- <!-- this to work you will need to uncomment the .shtml mime type -->
- <!-- definition towards the bottom of this file. -->
- <!-- The contentType init param allows you to apply SSI processing to JSP -->
- <!-- pages, javascript, or any other content you wish. This filter -->
- <!-- supports the following initialization parameters (default values are -->
- <!-- in square brackets): -->
- <!-- -->
- <!-- contentType A regex pattern that must be matched before -->
- <!-- SSI processing is applied. -->
- <!-- [text/x-server-parsed-html(;.*)?] -->
- <!-- -->
- <!-- debug Debugging detail level for messages logged -->
- <!-- by this servlet. [0] -->
- <!-- -->
- <!-- expires The number of seconds before a page with SSI -->
- <!-- directives will expire. [No default] -->
- <!-- -->
- <!-- isVirtualWebappRelative -->
- <!-- Should "virtual" paths be interpreted as -->
- <!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI filter, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
-
-<!--
- <filter>
- <filter-name>ssi</filter-name>
- <filter-class>
- org.apache.catalina.ssi.SSIFilter
- </filter-class>
- <init-param>
- <param-name>contentType</param-name>
- <param-value>text/x-server-parsed-html(;.*)?</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>expires</param-name>
- <param-value>666</param-value>
- </init-param>
- <init-param>
- <param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
- </init-param>
- </filter>
--->
-
-
- <!-- ==================== Built In Filter Mappings ====================== -->
-
- <!-- The mapping for the SSI Filter -->
-<!--
- <filter-mapping>
- <filter-name>ssi</filter-name>
- <url-pattern>*.shtml</url-pattern>
- </filter-mapping>
--->
-
-
- <!-- ==================== Default Session Configuration ================= -->
- <!-- You can set the default session timeout (in minutes) for all newly -->
- <!-- created sessions by modifying the value below. -->
-
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
-
- <!-- ===================== Default MIME Type Mappings =================== -->
- <!-- When serving static resources, Tomcat will automatically generate -->
- <!-- a "Content-Type" header based on the resource's filename extension, -->
- <!-- based on these mappings. Additional mappings can be added here (to -->
- <!-- apply to all web applications), or in your own application's web.xml -->
- <!-- deployment descriptor. -->
-
- <mime-mapping>
- <extension>abs</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ai</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aif</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aifc</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aiff</extension>
- <mime-type>audio/x-aiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>aim</extension>
- <mime-type>application/x-aim</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>art</extension>
- <mime-type>image/x-jg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>asf</extension>
- <mime-type>video/x-ms-asf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>asx</extension>
- <mime-type>video/x-ms-asf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>au</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>avi</extension>
- <mime-type>video/x-msvideo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>avx</extension>
- <mime-type>video/x-rad-screenplay</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bcpio</extension>
- <mime-type>application/x-bcpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bin</extension>
- <mime-type>application/octet-stream</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>bmp</extension>
- <mime-type>image/bmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>body</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cdf</extension>
- <mime-type>application/x-cdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cer</extension>
- <mime-type>application/x-x509-ca-cert</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>class</extension>
- <mime-type>application/java</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>cpio</extension>
- <mime-type>application/x-cpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>csh</extension>
- <mime-type>application/x-csh</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>css</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dib</extension>
- <mime-type>image/bmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/msword</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dtd</extension>
- <mime-type>application/xml-dtd</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dv</extension>
- <mime-type>video/x-dv</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>dvi</extension>
- <mime-type>application/x-dvi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>eps</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>etx</extension>
- <mime-type>text/x-setext</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>exe</extension>
- <mime-type>application/octet-stream</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gif</extension>
- <mime-type>image/gif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gtar</extension>
- <mime-type>application/x-gtar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>gz</extension>
- <mime-type>application/x-gzip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hdf</extension>
- <mime-type>application/x-hdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hqx</extension>
- <mime-type>application/mac-binhex40</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htc</extension>
- <mime-type>text/x-component</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>htm</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>html</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>hqx</extension>
- <mime-type>application/mac-binhex40</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ief</extension>
- <mime-type>image/ief</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jad</extension>
- <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jar</extension>
- <mime-type>application/java-archive</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>java</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jnlp</extension>
- <mime-type>application/x-java-jnlp-file</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpe</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpeg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jpg</extension>
- <mime-type>image/jpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>js</extension>
- <mime-type>text/javascript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jsf</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>jspf</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>kar</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>latex</extension>
- <mime-type>application/x-latex</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>m3u</extension>
- <mime-type>audio/x-mpegurl</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mac</extension>
- <mime-type>image/x-macpaint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>man</extension>
- <mime-type>application/x-troff-man</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mathml</extension>
- <mime-type>application/mathml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>me</extension>
- <mime-type>application/x-troff-me</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mid</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>midi</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mif</extension>
- <mime-type>application/x-mif</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mov</extension>
- <mime-type>video/quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>movie</extension>
- <mime-type>video/x-sgi-movie</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp1</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp2</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mp3</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpa</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpe</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpeg</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpega</extension>
- <mime-type>audio/x-mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpg</extension>
- <mime-type>video/mpeg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>mpv2</extension>
- <mime-type>video/mpeg2</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ms</extension>
- <mime-type>application/x-wais-source</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>nc</extension>
- <mime-type>application/x-netcdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>oda</extension>
- <mime-type>application/oda</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Database -->
- <extension>odb</extension>
- <mime-type>application/vnd.oasis.opendocument.database</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Chart -->
- <extension>odc</extension>
- <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Formula -->
- <extension>odf</extension>
- <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Drawing -->
- <extension>odg</extension>
- <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Image -->
- <extension>odi</extension>
- <mime-type>application/vnd.oasis.opendocument.image</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Master Document -->
- <extension>odm</extension>
- <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Presentation -->
- <extension>odp</extension>
- <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Spreadsheet -->
- <extension>ods</extension>
- <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Text -->
- <extension>odt</extension>
- <mime-type>application/vnd.oasis.opendocument.text</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ogg</extension>
- <mime-type>application/ogg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Drawing Template -->
- <extension>otg </extension>
- <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- HTML Document Template -->
- <extension>oth</extension>
- <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Presentation Template -->
- <extension>otp</extension>
- <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Spreadsheet Template -->
- <extension>ots</extension>
- <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- OpenDocument Text Template -->
- <extension>ott</extension>
- <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pbm</extension>
- <mime-type>image/x-portable-bitmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pct</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pdf</extension>
- <mime-type>application/pdf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pgm</extension>
- <mime-type>image/x-portable-graymap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pic</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pict</extension>
- <mime-type>image/pict</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pls</extension>
- <mime-type>audio/x-scpls</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>png</extension>
- <mime-type>image/png</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pnm</extension>
- <mime-type>image/x-portable-anymap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>pnt</extension>
- <mime-type>image/x-macpaint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppm</extension>
- <mime-type>image/x-portable-pixmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/powerpoint</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ps</extension>
- <mime-type>application/postscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>psd</extension>
- <mime-type>image/x-photoshop</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qt</extension>
- <mime-type>video/quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qti</extension>
- <mime-type>image/x-quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>qtif</extension>
- <mime-type>image/x-quicktime</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ras</extension>
- <mime-type>image/x-cmu-raster</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rdf</extension>
- <mime-type>application/rdf+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rgb</extension>
- <mime-type>image/x-rgb</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rm</extension>
- <mime-type>application/vnd.rn-realmedia</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>roff</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rtf</extension>
- <mime-type>application/rtf</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>rtx</extension>
- <mime-type>text/richtext</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sh</extension>
- <mime-type>application/x-sh</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>shar</extension>
- <mime-type>application/x-shar</mime-type>
- </mime-mapping>
-<!--
- <mime-mapping>
- <extension>shtml</extension>
- <mime-type>text/x-server-parsed-html</mime-type>
- </mime-mapping>
--->
- <mime-mapping>
- <extension>smf</extension>
- <mime-type>audio/x-midi</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sit</extension>
- <mime-type>application/x-stuffit</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>snd</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>src</extension>
- <mime-type>application/x-wais-source</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sv4cpio</extension>
- <mime-type>application/x-sv4cpio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>sv4crc</extension>
- <mime-type>application/x-sv4crc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>swf</extension>
- <mime-type>application/x-shockwave-flash</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>t</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tar</extension>
- <mime-type>application/x-tar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tcl</extension>
- <mime-type>application/x-tcl</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tex</extension>
- <mime-type>application/x-tex</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>texi</extension>
- <mime-type>application/x-texinfo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>texinfo</extension>
- <mime-type>application/x-texinfo</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tif</extension>
- <mime-type>image/tiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tiff</extension>
- <mime-type>image/tiff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tr</extension>
- <mime-type>application/x-troff</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>tsv</extension>
- <mime-type>text/tab-separated-values</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>txt</extension>
- <mime-type>text/plain</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ulw</extension>
- <mime-type>audio/basic</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ustar</extension>
- <mime-type>application/x-ustar</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>vxml</extension>
- <mime-type>application/voicexml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xbm</extension>
- <mime-type>image/x-xbitmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xht</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xhtml</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xml</extension>
- <mime-type>application/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xpm</extension>
- <mime-type>image/x-xpixmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xsl</extension>
- <mime-type>application/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xslt</extension>
- <mime-type>application/xslt+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xul</extension>
- <mime-type>application/vnd.mozilla.xul+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xwd</extension>
- <mime-type>image/x-xwindowdump</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wav</extension>
- <mime-type>audio/x-wav</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svg</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svgz</extension>
- <mime-type>image/svg+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>vsd</extension>
- <mime-type>application/x-visio</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Wireless Bitmap -->
- <extension>wbmp</extension>
- <mime-type>image/vnd.wap.wbmp</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- WML Source -->
- <extension>wml</extension>
- <mime-type>text/vnd.wap.wml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Compiled WML -->
- <extension>wmlc</extension>
- <mime-type>application/vnd.wap.wmlc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- WML Script Source -->
- <extension>wmls</extension>
- <mime-type>text/vnd.wap.wmlscript</mime-type>
- </mime-mapping>
- <mime-mapping>
- <!-- Compiled WML Script -->
- <extension>wmlscriptc</extension>
- <mime-type>application/vnd.wap.wmlscriptc</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wrl</extension>
- <mime-type>x-world/x-vrml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>Z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>z</extension>
- <mime-type>application/x-compress</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>zip</extension>
- <mime-type>application/zip</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xls</extension>
- <mime-type>application/vnd.ms-excel</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
- </mime-mapping>
-
- <!-- ==================== Default Welcome File List ===================== -->
- <!-- When a request URI refers to a directory, the default servlet looks -->
- <!-- for a "welcome file" within that directory and, if present, -->
- <!-- to the corresponding resource URI for display. If no welcome file -->
- <!-- is present, the default servlet either serves a directory listing, -->
- <!-- or returns a 404 status, depending on how it is configured. -->
- <!-- -->
- <!-- If you define welcome files in your own application's web.xml -->
- <!-- deployment descriptor, that list *replaces* the list configured -->
- <!-- here, so be sure that you include any of the default values that -->
- <!-- you wish to include. -->
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/context.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/context.xml
deleted file mode 100644
index 6cff172..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/context.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- The contents of this file will be loaded for each web application -->
-<Context cookies="true" crossContext="true" reloadable="${rhq.webappsReloadable}">
- <!-- Session persistence is disable by default. To enable for all web
- apps set the pathname to a non-empty value:
- <Manager pathname="SESSIONS.ser" />
-
- To enable session persistence for a single web app, add a
- WEB-INF/context.xml
- -->
- <Manager pathname="" />
-
- <!-- Install an InstanceListener to handle the establishment of the run-as
- role for servlet init/destroy events.
- -->
- <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener>
-
-</Context>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/server.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/server.xml
deleted file mode 100644
index 4d4ae48..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/server.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!-- RHQ -->
-<!-- Docs for this file: http://tomcat.apache.org/tomcat-5.5-doc/config/ -->
-
-<Server>
-
- <!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
-
- <!-- Use a custom version of StandardService that allows the
- connectors to be started independent of the normal lifecycle
- start to allow web apps to be deployed before starting the
- connectors.
- -->
- <Service name="jboss.web">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Documentation at :
- Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
- Java AJP Connector: /docs/config/ajp.html
- APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 7080
- -->
- <!-- RHQ -->
- <Connector port="${rhq.server.startup.web.http.port}"
- address="${jboss.bind.address}"
- protocol="HTTP/1.1"
- scheme="http"
- maxThreads="${rhq.server.startup.web.max-connections}"
- acceptCount="300"
- maxHttpHeaderSize="10240"
- enableLookups="false"
- compression="51200"
- compressableMimeType="text/html,text/xml,text/plain,text/javascript,text/css"
- emptySessionPath="true"
- redirectPort="${rhq.server.startup.web.https.port}"
- connectionTimeout="20000"
- strategy="ms"
- disableUploadTimeout="true"/>
-
- <!-- Define a SSL HTTP/1.1 Connector on port 7443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!-- RHQ -->
- <!-- SSL/TLS Connector configuration using the RHQ keystore -->
- <Connector port="${rhq.server.startup.web.https.port}"
- address="${jboss.bind.address}"
- protocol="HTTP/1.1"
- scheme="https"
- maxThreads="${rhq.server.startup.web.max-connections}"
- acceptCount="300"
- maxHttpHeaderSize="10240"
- enableLookups="false"
- compression="51200"
- compressableMimeType="text/html,text/xml,text/plain,text/javascript,text/css"
- secure="true"
- SSLEnabled="true"
- clientAuth="${rhq.server.tomcat.security.client-auth-mode}"
- sslProtocol="${rhq.server.tomcat.security.secure-socket-protocol}"
- algorithm="${rhq.server.tomcat.security.algorithm}"
- keyAlias="${rhq.server.tomcat.security.keystore.alias}"
- keystoreFile="${rhq.server.tomcat.security.keystore.file}"
- keystorePass="${rhq.server.tomcat.security.keystore.password}"
- keystoreType="${rhq.server.tomcat.security.keystore.type}"
- truststoreFile="${rhq.server.tomcat.security.truststore.file}"
- truststorePass="${rhq.server.tomcat.security.truststore.password}"
- truststoreType="${rhq.server.tomcat.security.truststore.type}" />
-
- <!-- Provides a secure but un-authenticated https connector for browsers to use.
- Uncomment this connector if all of the following are true:
- 1) the server-to-agent communications is secured via the sslservlet transport
- 2) the server-to-agent communications always require agents to authenticate themselves with certificates
- 3) you want to allow users' browsers to access the GUI via the https: protocol
- 4) you do not want to force users' browsers to authenticate themselves with certificates
- -->
- <!--
- <Connector port="9443"
- address="${jboss.bind.address}"
- protocol="HTTP/1.1"
- scheme="https"
- maxThreads="${rhq.server.startup.web.max-connections}"
- acceptCount="300"
- maxHttpHeaderSize="10240"
- enableLookups="false"
- secure="true"
- SSLEnabled="true"
- clientAuth="false"
- sslProtocol="TLS"
- keystoreFile="${jboss.server.home.dir}/conf/rhq.keystore"
- keystorePass="RHQManagement" />
- -->
-
- <!-- Define an AJP 1.3 Connector -->
- <!-- RHQ -->
- <!-- BZ: 557815 Commented out by default as the AJP component support is not on
- par with the http/https connectors.
- <Connector port="${rhq.server.startup.ajp.port}" address="${jboss.bind.address}" protocol="AJP/1.3"
- emptySessionPath="true" enableLookups="false" redirectPort="${rhq.server.startup.web.https.port}" />
- -->
-
- <Engine name="jboss.web" defaultHost="localhost">
-
- <!-- The JAAS based authentication and authorization realm implementation
- that is compatible with the jboss 3.2.x realm implementation.
- - certificatePrincipal : the class name of the
- org.jboss.security.auth.certs.CertificatePrincipal impl
- used for mapping X509[] cert chains to a Princpal.
- - allRolesMode : how to handle an auth-constraint with a role-name=*,
- one of strict, authOnly, strictAuthOnly
- + strict = Use the strict servlet spec interpretation which requires
- that the user have one of the web-app/security-role/role-name
- + authOnly = Allow any authenticated user
- + strictAuthOnly = Allow any authenticated user only if there are no
- web-app/security-roles
- -->
- <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
- certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
- allRolesMode="authOnly"
- />
- <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
- behavior of JBossSecurityMgrRealm, but overrides the authorization
- checks to use JACC permissions with the current java.security.Policy
- to determine authorized access.
- - allRolesMode : how to handle an auth-constraint with a role-name=*,
- one of strict, authOnly, strictAuthOnly
- + strict = Use the strict servlet spec interpretation which requires
- that the user have one of the web-app/security-role/role-name
- + authOnly = Allow any authenticated user
- + strictAuthOnly = Allow any authenticated user only if there are no
- web-app/security-roles
- <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
- certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
- allRolesMode="authOnly"
- />
- -->
-
- <Host name="localhost"
- autoDeploy="false" deployOnStartup="false" deployXML="false"
- configClass="org.jboss.web.tomcat.security.config.JBossContextConfig"
- >
-
- <!-- Uncomment to enable request dumper. This Valve "logs interesting
- contents from the specified Request (before processing) and the
- corresponding Response (after processing). It is especially useful
- in debugging problems related to headers and cookies."
- -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve" />
- -->
-
- <!-- Access logger -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- prefix="localhost_access_log." suffix=".log"
- pattern="common" directory="${jboss.server.home.dir}/log"
- resolveHosts="false" />
- -->
-
- <!-- Uncomment to enable single sign-on across web apps
- deployed to this host. Does not provide SSO across a cluster.
-
- If this valve is used, do not use the JBoss ClusteredSingleSignOn
- valve shown below.
-
- A new configuration attribute is available beginning with
- release 4.0.4:
-
- cookieDomain configures the domain to which the SSO cookie
- will be scoped (i.e. the set of hosts to
- which the cookie will be presented). By default
- the cookie is scoped to "/", meaning the host
- that presented it. Set cookieDomain to a
- wider domain (e.g. "xyz.com") to allow an SSO
- to span more than one hostname.
- -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Uncomment to enable single sign-on across web apps
- deployed to this host AND to all other hosts in the cluster.
-
- If this valve is used, do not use the standard Tomcat SingleSignOn
- valve shown above.
-
- Valve uses a JBossCache instance to support SSO credential
- caching and replication across the cluster. The JBossCache
- instance must be configured separately. By default, the valve
- shares a JBossCache with the service that supports HttpSession
- replication. See the "jboss-web-cluster-service.xml" file in the
- server/all/deploy directory for cache configuration details.
-
- Besides the attributes supported by the standard Tomcat
- SingleSignOn valve (see the Tomcat docs), this version also
- supports the following attributes:
-
- cookieDomain see above
-
- treeCacheName JMX ObjectName of the JBossCache MBean used to
- support credential caching and replication across
- the cluster. If not set, the default value is
- "jboss.cache:service=TomcatClusteringCache", the
- standard ObjectName of the JBossCache MBean used
- to support session replication.
- -->
- <!--
- <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
- -->
-
- <!-- Check for unclosed connections and transaction terminated checks
- in servlets/jsps.
-
- Important: The dependency on the CachedConnectionManager
- in META-INF/jboss-service.xml must be uncommented, too
- -->
- <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
- cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
- transactionManagerObjectName="jboss:service=TransactionManager" />
-
- </Host>
-
- </Engine>
-
- </Service>
-
-</Server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jms-h2.rej/rhq-jdbc2-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jms-h2.rej/rhq-jdbc2-service.xml
deleted file mode 100644
index 13f8320..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jms-h2.rej/rhq-jdbc2-service.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- The JBossAS distro does not provide a sample H2 service file,
- so we're providing one for RHQ with default properties -->
-
-<server>
-
- <!-- ==================================================================== -->
- <!-- Persistence and caching using H2 -->
- <!-- IMPORTANT: Remove hsqldb-jdbc2-service.xml -->
- <!-- ==================================================================== -->
-
- <!--
- | The destination manager is the core service within JBossMQ
- -->
- <mbean code="org.jboss.mq.server.jmx.DestinationManager" name="jboss.mq:service=DestinationManager">
- <depends optional-attribute-name="MessageCache">jboss.mq:service=MessageCache</depends>
- <depends optional-attribute-name="PersistenceManager">jboss.mq:service=PersistenceManager</depends>
- <depends optional-attribute-name="StateManager">jboss.mq:service=StateManager</depends>
- </mbean>
-
- <!--
- | The MessageCache decides where to put JBossMQ message that
- | are sitting around waiting to be consumed by a client.
- |
- | The memory marks are in Megabytes. Once the JVM memory usage hits
- | the high memory mark, the old messages in the cache will start getting
- | stored in the DataDirectory. As memory usage gets closer to the
- | Max memory mark, the amount of message kept in the memory cache approaches 0.
- -->
- <mbean code="org.jboss.mq.server.MessageCache"
- name="jboss.mq:service=MessageCache">
- <attribute name="HighMemoryMark">50</attribute>
- <attribute name="MaxMemoryMark">60</attribute>
- <attribute name="CacheStore">jboss.mq:service=PersistenceManager</attribute>
- </mbean>
-
- <!-- The PersistenceManager is used to store messages to disk. -->
- <!--
- | The jdbc2 PersistenceManager is the new improved JDBC implementation.
- | This implementation allows you to control how messages are stored in
- | the database.
- -->
- <mbean code="org.jboss.mq.pm.jdbc2.PersistenceManager"
- name="jboss.mq:service=PersistenceManager">
- <depends optional-attribute-name="ConnectionManager">jboss.jca:service=DataSourceBinding,name=RHQDS</depends>
- <attribute name="SqlProperties">
- BLOB_TYPE=OBJECT_BLOB
- INSERT_TX = INSERT INTO JMS_TRANSACTIONS (TXID) values(?)
- INSERT_MESSAGE = INSERT INTO JMS_MESSAGES (MESSAGEID, DESTINATION, MESSAGEBLOB, TXID, TXOP) VALUES(?,?,?,?,?)
- SELECT_ALL_UNCOMMITED_TXS = SELECT TXID FROM JMS_TRANSACTIONS
- SELECT_MAX_TX = SELECT MAX(TXID) FROM JMS_MESSAGES
- SELECT_MESSAGES_IN_DEST = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE DESTINATION=?
- SELECT_MESSAGE = SELECT MESSAGEID, MESSAGEBLOB FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
- MARK_MESSAGE = UPDATE JMS_MESSAGES SET (TXID, TXOP) VALUES(?,?) WHERE MESSAGEID=? AND DESTINATION=?
- DELETE_ALL_MESSAGE_WITH_TX = DELETE FROM JMS_MESSAGES WHERE TXID=?
- DELETE_TX = DELETE FROM JMS_TRANSACTIONS WHERE TXID = ?
- DELETE_MARKED_MESSAGES = DELETE FROM JMS_MESSAGES WHERE TXID=? AND TXOP=?
- DELETE_MESSAGE = DELETE FROM JMS_MESSAGES WHERE MESSAGEID=? AND DESTINATION=?
- CREATE_MESSAGE_TABLE = CREATE TABLE JMS_MESSAGES ( MESSAGEID INTEGER NOT NULL, \
- DESTINATION VARCHAR(50) NOT NULL, TXID INTEGER, TXOP CHAR(1), \
- MESSAGEBLOB OBJECT, PRIMARY KEY (MESSAGEID, DESTINATION) )
- CREATE_TX_TABLE = CREATE TABLE JMS_TRANSACTIONS ( TXID INTEGER )
- CREATE_TABLES_ON_STARTUP = FALSE
- </attribute>
- <!-- Uncomment to override the transaction timeout for recovery per queue/subscription, in seconds -->
- <!--attribute name="RecoveryTimeout">0</attribute-->
- <!-- The number of blobs to load at once during message recovery -->
- <attribute name="RecoverMessagesChunk">0</attribute>
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml
deleted file mode 100644
index 0ed9946..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <description>The standard web descriptor for the html adaptor</description>
- <!--
- <filter>
- <filter-name>JmxOpsAccessControlFilter</filter-name>
- <filter-class>org.jboss.jmx.adaptor.html.JMXOpsAccessControlFilter</filter-class>
- <init-param>
- <param-name>updateAttributes</param-name>
- <param-value>UpdateAttributeRole</param-value>
- <description>Comma-delimited Roles that define the JMX Operation denoting updation of Attributes</description>
- </init-param>
- <init-param>
- <param-name>invokeOp</param-name>
- <param-value>InvokeOpRole</param-value>
- <description>Comma-delimited Roles that define the JMX Operation denoting Invocation of Operations</description>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>JmxOpsAccessControlFilter</filter-name>
- <servlet-name>HtmlAdaptor</servlet-name>
- </filter-mapping>
- -->
- <servlet>
- <servlet-name>HtmlAdaptor</servlet-name>
- <servlet-class>org.jboss.jmx.adaptor.html.HtmlAdaptorServlet</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>ClusteredConsoleServlet</servlet-name>
- <servlet-class>org.jboss.jmx.adaptor.html.ClusteredConsoleServlet</servlet-class>
- <init-param>
- <param-name>jgProps</param-name>
- <param-value>UDP(ip_mcast=true;ip_ttl=16;loopback=false;mcast_addr=${jboss.partition.udpGroup:228.1.2.3};mcast_port=${jboss.jmxconsolepartition.mcast_port:45566}):
-org.jboss.jmx.adaptor.control.FindView
- </param-value>
- <description>The JGroups protocol stack config</description>
- </init-param>
- </servlet>
- <servlet>
- <servlet-name>DisplayMBeans</servlet-name>
- <jsp-file>/displayMBeans.jsp</jsp-file>
- </servlet>
- <servlet>
- <servlet-name>InspectMBean</servlet-name>
- <jsp-file>/inspectMBean.jsp</jsp-file>
- </servlet>
- <servlet>
- <servlet-name>DisplayOpResult</servlet-name>
- <jsp-file>/displayOpResult.jsp</jsp-file>
- </servlet>
- <servlet>
- <servlet-name>ClusterView</servlet-name>
- <jsp-file>/cluster/clusterView.jsp</jsp-file>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HtmlAdaptor</servlet-name>
- <url-pattern>/HtmlAdaptor</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>ClusteredConsoleServlet</servlet-name>
- <url-pattern>/cluster/ClusteredConsole</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>DisplayMBeans</servlet-name>
- <url-pattern>/DisplayMBeans</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>InspectMBean</servlet-name>
- <url-pattern>/InspectMBean</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>DisplayOpResult</servlet-name>
- <url-pattern>/DisplayOpResult</url-pattern>
- </servlet-mapping>
-
- <!-- A security constraint that restricts access to the HTML JMX console
- to users with the role JBossAdmin. Edit the roles to what you want and
- uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
- secured access to the HTML JMX console.
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>HtmlAdaptor</web-resource-name>
- <description>An example security config that only allows users with the
- role JBossAdmin to access the HTML JMX console web application
- </description>
- <url-pattern>/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>JBossAdmin</role-name>
- </auth-constraint>
- </security-constraint>
- -->
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>JBoss JMX Console</realm-name>
- </login-config>
-
- <security-role>
- <role-name>JBossAdmin</role-name>
- </security-role>
-</web-app>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/mail-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/mail-service.xml
deleted file mode 100644
index d21950d..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/mail-service.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: mail-service.xml 62349 2007-04-15 16:48:15Z dimitris(a)jboss.org $ -->
-<server>
-
- <!-- RHQ Server Mail Connection Factory -->
-
- <mbean code="org.jboss.mail.MailService"
- name="jboss:service=Mail">
- <attribute name="JNDIName">java:/Mail</attribute>
- <attribute name="User">nobody</attribute>
- <attribute name="Password">password</attribute>
- <attribute name="Configuration">
- <!-- A test configuration -->
- <configuration>
- <!-- Change to your mail server prototocol -->
- <property name="mail.store.protocol" value="pop3"/>
- <property name="mail.transport.protocol" value="smtp"/>
-
- <!-- Change to the user who will receive mail -->
- <property name="mail.user" value="nobody"/>
-
- <!-- Change to the mail server -->
- <property name="mail.pop3.host" value="pop3.nosuchhost.nosuchdomain.com"/>
-
- <!-- Change to the SMTP gateway server -->
- <property name="mail.smtp.host" value="${rhq.server.email.smtp-host:127.0.0.1}"/>
-
- <!-- The mail server port -->
- <property name="mail.smtp.port" value="${rhq.server.email.smtp-port:25}"/>
-
- <!-- Change to the address mail will be from -->
- <property name="mail.from" value="${rhq.server.email.from-address:rhqadmin@127.0.0.1}"/>
-
- <!-- Enable debugging output from the javamail classes -->
- <property name="mail.debug" value="false"/>
- </configuration>
- </attribute>
- <depends>jboss:service=Naming</depends>
- </mbean>
-
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
deleted file mode 100644
index 79a9677..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<server>
-
- <mbean code="org.jboss.cache.TreeCache"
- name="rhq.cache:service=cache">
- <depends>jboss:service=TransactionManager</depends>
-
- <!-- Configure the TransactionManager -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-
- <!-- Isolation level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
- <!--
- Node locking scheme:
- OPTIMISTIC
- PESSIMISTIC (default)
- -->
- <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
-
- <!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
- <attribute name="CacheMode">LOCAL</attribute>
-
- <!-- Just used for async repl: use a replication queue -->
- <attribute name="UseReplQueue">false</attribute>
-
- <!-- Replication interval for replication queue (in ms) -->
- <attribute name="ReplQueueInterval">100</attribute>
-
- <!-- Max number of elements which trigger replication -->
- <attribute name="ReplQueueMaxElements">10</attribute>
-
-
- <!-- Name of cluster. Needs to be the same for all clusters, in order
- to find each other
- -->
- <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-RHQ-Cache</attribute>
-
- <!-- JGroups protocol stack properties. Can also be a URL,
- e.g. file:/home/bela/default.xml
- <attribute name="ClusterProperties"></attribute>
- -->
-<!--
-
- <attribute name="ClusterConfig">
-
- <config>
- <!– UDP: if you have a multihomed machine,
- set the bind_addr attribute to the appropriate NIC IP address, e.g bind_addr="192.168.0.2"
- –>
- <!– UDP: On Windows machines, because of the media sense feature
- being broken with multicast (even after disabling media sense)
- set the loopback attribute to true
-
- TODO need to parametrize and add to installer
-
- –>
- <UDP
- mcast_addr="${jgroups.udp.mcast_addr:230.1.2.3}"
- mcast_port="${jboss.alertcachepartition.mcast_port:48899}"
- ip_ttl="${jgroups.udp.ip_ttl:2}"
- bind_addr="${jgroups.bind_addr}"
- ip_mcast="true"
- tos="8"
- mcast_send_buf_size="150000"
- mcast_recv_buf_size="80000"
- ucast_send_buf_size="150000"
- ucast_recv_buf_size="80000"
- loopback="${rhq.server.startup.partition.udpLoopback:false}" />
- <PING timeout="2000"
- num_initial_members="3"
- up_thread="false"
- down_thread="false" />
- <MERGE2 min_interval="10000"
- max_interval="20000" />
- <FD_SOCK />
- <VERIFY_SUSPECT timeout="1500"
- up_thread="false"
- down_thread="false" />
- <pbcast.NAKACK gc_lag="50"
- retransmit_timeout="600,1200,2400,4800"
- max_xmit_size="8192"
- up_thread="false"
- down_thread="false" />
- <UNICAST timeout="600,1200,2400"
- down_thread="false" />
- <pbcast.STABLE desired_avg_gossip="20000"
- up_thread="false"
- down_thread="false" />
- <FRAG frag_size="8192" down_thread="false"
- up_thread="false" />
- <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
- shun="true" print_local_addr="true" />
- <pbcast.STATE_TRANSFER up_thread="true" down_thread="true" />
- </config>
- </attribute>
--->
-
- <!-- Whether or not to fetch state on joining a cluster -->
- <attribute name="FetchStateOnStartup">true</attribute>
-
- <!-- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
-
- -->
- <attribute name="InitialStateRetrievalTimeout">5000</attribute>
-
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
- <attribute name="SyncReplTimeout">15000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
- <attribute name="LockAcquisitionTimeout">10000</attribute>
-
- <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
- <!-- Specific eviction policy configurations. This is LRU -->
- <attribute name="EvictionPolicyConfig">
- <config>
- <attribute name="wakeUpIntervalSeconds">5</attribute>
- <!-- Cache wide default -->
- <region name="/_default_">
- <attribute name="maxNodes">50000</attribute>
- <attribute name="timeToLiveSeconds">3600</attribute>
- </region>
- <region name="/schedules">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
- </region>
- <region name="/test/">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">5</attribute>
- </region>
- <region name="/maxAgeTest/">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
- </region>
- </config>
- </attribute>
- </mbean>
-
-
- <!-- Map the cache into JNDI -->
- <mbean
- code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
- name="mydomain:service=proxyFactory,type=jrmp,target=factory">
- <attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
- <attribute name="TargetName">rhq.cache:service=cache</attribute>
- <attribute name="JndiName">RhqCache</attribute>
- <attribute name="InvokeTargetMethod">true</attribute>
- <attribute name="ExportedInterface">org.jboss.cache.TreeCacheMBean</attribute>
- <attribute name="ClientInterceptors">
- <iterceptors>
- <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </iterceptors>
- </attribute>
- <depends>jboss:service=invoker,type=jrmp</depends>
- <depends>rhq.cache:service=cache</depends>
- </mbean>
-</server>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.h2.rej b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.h2.rej
deleted file mode 100644
index 612e0c1..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.h2.rej
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- The RHQ datasources for H2 -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RHQDS</jndi-name>
- <xa-datasource-class>${rhq.server.database.xa-datasource-class}</xa-datasource-class>
- <xa-datasource-property name="URL">${rhq.server.database.connection-url}</xa-datasource-property>
-
- <no-tx-separate-pools/>
- <track-connection-by-tx/>
- <isSameRM-override-value>false</isSameRM-override-value>
-
- <security-domain>XADSRealm</security-domain>
-
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>50</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>0</prepared-statement-cache-size>
- <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql>
- </xa-datasource>
-
- <!-- Quartz needs a no-tx datasource defined -->
- <no-tx-datasource>
- <jndi-name>NoTxRHQDS</jndi-name>
- <connection-url>${rhq.server.database.connection-url}</connection-url>
- <driver-class>${rhq.server.database.driver-class}</driver-class>
- <security-domain>NONXADSRealm</security-domain>
- <connection-property name="char.encoding">UTF-8</connection-property>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>2</min-pool-size>
- <max-pool-size>5</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>0</prepared-statement-cache-size>
- <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql>
- </no-tx-datasource>
-
-
-</datasources>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.oracle.rej b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.oracle.rej
deleted file mode 100644
index 5559b83..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.oracle.rej
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- The RHQ datasources for ORACLE -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RHQDS</jndi-name>
- <xa-datasource-class>${rhq.server.database.xa-datasource-class}</xa-datasource-class>
- <xa-datasource-property name="URL">${rhq.server.database.connection-url}</xa-datasource-property>
-
- <xa-datasource-property name="ConnectionProperties">SetBigStringTryClob=true</xa-datasource-property>
- <isSameRM-override-value>false</isSameRM-override-value>
- <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
- <!-- Checks the Oracle error codes and messages for fatal errors -->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- <!-- Oracles XA datasource cannot reuse a connection outside a transaction once enlisted in a global transaction and vice-versa -->
- <track-connection-by-tx/>
-
- <security-domain>XADSRealm</security-domain>
-
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>50</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <check-valid-connection-sql>select 1 from dual</check-valid-connection-sql>
- </xa-datasource>
-
- <!-- this currently isn't supported by the JBoss transaction manager
- <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter"
- name="jboss.jca:service=OracleXAExceptionFormatter">
- <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends>
- </mbean>
- -->
-
- <!-- Quartz needs a no-tx datasource defined -->
- <no-tx-datasource>
- <jndi-name>NoTxRHQDS</jndi-name>
- <connection-url>${rhq.server.database.connection-url}</connection-url>
- <driver-class>${rhq.server.database.driver-class}</driver-class>
-
- <security-domain>NONXADSRealm</security-domain>
-
- <connection-property name="char.encoding">UTF-8</connection-property>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>2</min-pool-size>
- <max-pool-size>5</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <check-valid-connection-sql>select 1 from dual</check-valid-connection-sql>
-
- <!-- Tells an Oracle 10g driver to properly implement clobs. -->
- <connection-property name="SetBigStringTryClob">true</connection-property>
- </no-tx-datasource>
-
-</datasources>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.postgres.rej b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.postgres.rej
deleted file mode 100644
index 2a71733..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.postgres.rej
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- The RHQ datasources for POSTGRES -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RHQDS</jndi-name>
- <xa-datasource-class>${rhq.server.database.xa-datasource-class}</xa-datasource-class>
- <xa-datasource-property name="ServerName">${rhq.server.database.server-name}</xa-datasource-property>
- <xa-datasource-property name="PortNumber">${rhq.server.database.port}</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">${rhq.server.database.db-name}</xa-datasource-property>
-
- <security-domain>XADSRealm</security-domain>
-
- <track-connection-by-tx/>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>50</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <check-valid-connection-sql>;</check-valid-connection-sql>
- </xa-datasource>
-
- <!-- Quartz needs a no-tx datasource defined -->
- <no-tx-datasource>
- <jndi-name>NoTxRHQDS</jndi-name>
- <connection-url>${rhq.server.database.connection-url}</connection-url>
- <driver-class>${rhq.server.database.driver-class}</driver-class>
- <security-domain>NONXADSRealm</security-domain>
- <connection-property name="char.encoding">UTF-8</connection-property>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>2</min-pool-size>
- <max-pool-size>5</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <check-valid-connection-sql>;</check-valid-connection-sql>
- </no-tx-datasource>
-
-</datasources>
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.sqlserver.rej b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.sqlserver.rej
deleted file mode 100644
index c79418f..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.sqlserver.rej
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- The RHQ datasources for SQL Server -->
-
-<datasources>
-
- <xa-datasource>
- <jndi-name>RHQDS</jndi-name>
- <xa-datasource-class>${rhq.server.database.xa-datasource-class}</xa-datasource-class>
- <xa-datasource-property name="ServerName">${rhq.server.database.server-name}</xa-datasource-property>
- <xa-datasource-property name="PortNumber">${rhq.server.database.port}</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">${rhq.server.database.db-name}</xa-datasource-property>
-
- <track-connection-by-tx></track-connection-by-tx>
- <isSameRM-override-value>false</isSameRM-override-value>
-
- <!--
- When set to true, emulate XA distributed transaction support, when set to false use experimental
- true distributed transaction support. True distributed transaction support is only available for
- SQL Server 2000 and requires the installation of an external stored procedure in the target server
- (see the README.XA file in the distribution for details).
-
- <xa-datasource-property name="XaEmulation">true</xa-datasource-property>
- -->
- <security-domain>XADSRealm</security-domain>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>50</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <new-connection-sql>select 1</new-connection-sql>
- <check-valid-connection-sql>select 1</check-valid-connection-sql>
- <set-tx-query-timeout></set-tx-query-timeout>
- </xa-datasource>
-
- <!-- Quartz needs a no-tx datasource defined -->
- <no-tx-datasource>
- <jndi-name>NoTxRHQDS</jndi-name>
- <connection-url>${rhq.server.database.connection-url}</connection-url>
- <driver-class>${rhq.server.database.driver-class}</driver-class>
- <security-domain>NONXADSRealm</security-domain>
-
- <track-connection-by-tx></track-connection-by-tx>
-
- <connection-property name="char.encoding">UTF-8</connection-property>
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
- <min-pool-size>2</min-pool-size>
- <max-pool-size>5</max-pool-size>
- <blocking-timeout-millis>30000</blocking-timeout-millis>
- <idle-timeout-minutes>15</idle-timeout-minutes>
- <prepared-statement-cache-size>75</prepared-statement-cache-size>
- <new-connection-sql>select 1</new-connection-sql>
- <check-valid-connection-sql>select 1</check-valid-connection-sql>
- <set-tx-query-timeout></set-tx-query-timeout>
- </no-tx-datasource>
-
-</datasources>
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml
deleted file mode 100644
index 177f168..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<server>
-
- <!-- Alert Queue Definitions -->
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=AlertConditionQueue">
- <!--
- don't redeliver messages on failure. It just causes more failures. just go straight to the dead messages
- by setting retry to 0. This is equivalent to setting the dLQMaxResent property to 0 in the MessageDriven
- annotation in the class definition.
- -->
- <attribute name="RecoveryRetries">0</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
-
- <!-- Drift Queue Definitions -->
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=DriftChangesetQueue">
- <!--
- don't redeliver messages on failure. It just causes more failures. just go straight to the dead messages
- by setting retry to 0. This is equivalent to setting the dLQMaxResent property to 0 in the MessageDriven
- annotation in the class definition.
- -->
- <attribute name="RecoveryRetries">0</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=DriftFileQueue">
- <!--
- don't redeliver messages on failure. It just causes more failures. just go straight to the dead messages
- by setting retry to 0. This is equivalent to setting the dLQMaxResent property to 0 in the MessageDriven
- annotation in the class definition.
- -->
- <attribute name="RecoveryRetries">0</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
-</server>
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/jboss-web.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/jboss-web.xml
deleted file mode 100644
index 493bdbf..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-
-<jboss-web>
- <context-root>/installer</context-root>
-</jboss-web>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/web.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/web.xml
deleted file mode 100644
index 1f2987d..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/WEB-INF/web.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <display-name>RHQ Post Installer Notification</display-name>
- <description>RHQ Post Installer Notification</description>
-
- <mime-mapping>
- <extension>jsf</extension>
- <mime-type>text/html</mime-type>
- </mime-mapping>
-
- <welcome-file-list>
- <welcome-file>/index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html
deleted file mode 100644
index 5da4047..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>The Server Is Installed!</title>
-
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Expires" content="-1" />
-<meta http-equiv="Cache-control" content="no-cache" />
-
-</head>
-<body>
- <p> </p>
- <h1 align="center">The Server Is Installed!</h1>
- <p align="center"><a href="/coregui">Click here to get started!</a></p>
-</body>
-</html>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf
deleted file mode 100644
index 4e5a220..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>The Server Is Installed!</title>
-
-</head>
-<body>
- <p> </p>
- <h1 align="center">The Server Is Installed!</h1>
- <p align="center"><a href="/coregui">Click here to get started!</a></p>
-</body>
-</html>
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf
deleted file mode 100644
index 4e5a220..0000000
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>The Server Is Installed!</title>
-
-</head>
-<body>
- <p> </p>
- <h1 align="center">The Server Is Installed!</h1>
- <p align="center"><a href="/coregui">Click here to get started!</a></p>
-</body>
-</html>
diff --git a/modules/enterprise/server/container/src/main/resources/plugins/README.txt b/modules/enterprise/server/container/src/main/resources/plugins/README.txt
deleted file mode 100644
index 8189194..0000000
--- a/modules/enterprise/server/container/src/main/resources/plugins/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-You can copy agent plugins or server plugins to this directory.
-
-When the server is running, it will periodically scan this
-directory and hot-deploy the plugins it finds.
-
-The jar files will be removed from this directory after they have
-been detected.
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml
deleted file mode 100644
index 6e2c0f7..0000000
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<assembly>
- <id>rhq-container</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.build.finalName}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.so</exclude>
- <exclude>**/*.sl</exclude>
- <exclude>**/*.dylib</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>**/*.sh</include>
- <include>**/*.so</include>
- <include>**/*.sl</include>
- <include>**/*.dylib</include>
- </includes>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
deleted file mode 100644
index 0480080..0000000
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ /dev/null
@@ -1,850 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- $Id: rhq-container.build.xml 9321 2008-02-11 05:03:45Z jmazzitelli $ -->
-
-<project name="rhq-container" basedir=".">
-
- <property name="default.rhq.server.database.hibernate-dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
- <property name="default.rhq.server.database.connection-url" value="jdbc:postgresql://127.0.0.1:5432/rhq" />
- <property name="default.rhq.server.database.driver-class" value="org.postgresql.Driver" />
- <property name="default.rhq.server.database.xa-datasource-class" value="org.postgresql.xa.PGXADataSource" />
- <property name="default.rhq.server.database.user-name" value="rhqadmin" />
- <property name="default.rhq.server.database.password" value="rhqadmin" />
- <property name="default.rhq.server.database.password.encrypted" value="1eeb2f255e832171df8592078de921bc" />
- <property name="default.rhq.server.database.type-mapping" value="PostgreSQL" />
- <!-- these are needed for the PostgreSQL XADataSource setup -->
- <property name="default.rhq.server.database.server-name" value="127.0.0.1" />
- <property name="default.rhq.server.database.port" value="5432" />
- <property name="default.rhq.server.database.db-name" value="rhq" />
- <property name="default.rhq.server.quartz.driverDelegateClass" value="org.quartz.impl.jdbcjobstore.PostgreSQLDelegate" />
- <property name="default.rhq.server.quartz.selectWithLockSQL" value="SELECT * FROM {0}LOCKS WHERE LOCK_NAME = ? FOR UPDATE" />
- <property name="default.rhq.server.quartz.lockHandlerClass" value="org.quartz.impl.jdbcjobstore.StdRowLockSemaphore" />
-
- <property name="rhq.sync.endpoint-address" value="false"/>
-
- <property name="default.rhq.server.drift.binary.content" value="false"/>
-
- <target name="set-predeploy-prop">
- <condition property="predeploy" value="true">
- <or>
- <equals arg1="${dev.profile.active}" arg2="true" />
- <equals arg1="${developer}" arg2="true" />
- </or>
- </condition>
- </target>
-
- <target name="set-dev-server-props" if="predeploy">
- <echo>*** Using dev database settings in rhq-server.properties...</echo>
- <property name="rhq.server.database.hibernate-dialect" value="${rhq.dev.ds.hibernate-dialect}" />
- <property name="rhq.server.database.connection-url" value="${rhq.dev.ds.connection-url}" />
- <property name="rhq.server.database.driver-class" value="${rhq.dev.ds.driver-class}" />
- <property name="rhq.server.database.xa-datasource-class" value="${rhq.dev.ds.xa-datasource-class}" />
- <property name="rhq.server.database.user-name" value="${rhq.dev.ds.user-name}" />
- <property name="rhq.server.database.password" value="${rhq.dev.ds.password.encrypted}" />
- <property name="rhq.server.database.type-mapping" value="${rhq.dev.ds.type-mapping}" />
- <property name="rhq.server.database.server-name" value="${rhq.dev.ds.server-name}" />
- <property name="rhq.server.database.port" value="${rhq.dev.ds.port}" />
- <property name="rhq.server.database.db-name" value="${rhq.dev.ds.db-name}" />
- <property name="rhq.server.quartz.driverDelegateClass" value="${rhq.dev.quartz.driverDelegateClass}" />
- <property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" />
- <property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" />
- <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/>
- </target>
-
- <target name="set-default-server-props" unless="predeploy">
- <echo>*** Using default database settings in rhq-server.properties...</echo>
- <property name="rhq.server.database.hibernate-dialect" value="${default.rhq.server.database.hibernate-dialect}" />
- <property name="rhq.server.database.connection-url" value="${default.rhq.server.database.connection-url}" />
- <property name="rhq.server.database.driver-class" value="${default.rhq.server.database.driver-class}" />
- <property name="rhq.server.database.xa-datasource-class" value="${default.rhq.server.database.xa-datasource-class}" />
- <property name="rhq.server.database.user-name" value="${default.rhq.server.database.user-name}" />
- <property name="rhq.server.database.password" value="${default.rhq.server.database.password.encrypted}" />
- <property name="rhq.server.database.type-mapping" value="${default.rhq.server.database.type-mapping}" />
- <property name="rhq.server.database.server-name" value="${default.rhq.server.database.server-name}" />
- <property name="rhq.server.database.port" value="${default.rhq.server.database.port}" />
- <property name="rhq.server.database.db-name" value="${default.rhq.server.database.db-name}" />
- <property name="rhq.server.quartz.driverDelegateClass" value="${default.rhq.server.quartz.driverDelegateClass}" />
- <property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" />
- <property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" />
- <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/>
- </target>
-
- <target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props">
- <echo>*** Database type is ${rhq.server.database.type-mapping}</echo>
-
- <property name="jboss.home" location="${project.build.outputDirectory}/jbossas" />
-
- <!-- TODO: we no longer deploy hypersonic - so we no longer have a marker file that we can check to see if server is running -->
- <!--
- <property name="marker.file" location="${jboss.home}/server/default/data/hypersonic/localDB.lck" />
- <fail message="The RHQ container appears to be currently running (${marker.file} exists). Please stop the container before rebuilding it in place.">
- <condition>
- <available file="${marker.file}" />
- </condition>
- </fail>
- -->
-
- <property name="jboss.deploy.dir" location="${jboss.home}/server/default/deploy" />
-
- <property name="jms.oracle.dir" value="jms-oracle.rej" />
- <property name="jms.postgres.dir" value="jms-postgres.rej" />
- <property name="jms.h2.dir" value="jms-h2.rej" />
- <property name="jms.sqlserver.dir" value="jms-sqlserver.rej" />
-
- <property name="ds.oracle.file" value="rhq-ds.xml.oracle.rej" />
- <property name="ds.postgres.file" value="rhq-ds.xml.postgres.rej" />
- <property name="ds.h2.file" value="rhq-ds.xml.h2.rej" />
- <property name="ds.sqlserver.file" value="rhq-ds.xml.sqlserver.rej" />
-
- <condition property="use-postgres" value="true">
- <contains string="${rhq.server.database.type-mapping}" substring="postgres" casesensitive="false" />
- </condition>
- <condition property="use-oracle" value="true">
- <contains string="${rhq.server.database.type-mapping}" substring="oracle" casesensitive="false" />
- </condition>
- <condition property="use-h2" value="true">
- <contains string="${rhq.server.database.type-mapping}" substring="h2" casesensitive="false" />
- </condition>
- <condition property="use-sqlserver" value="true">
- <contains string="${rhq.server.database.type-mapping}" substring="sqlserver" casesensitive="false" />
- </condition>
-
- <condition property="copy.dev.resources" value="true">
- <or>
- <equals arg1="${dev.profile.active}" arg2="true" />
- <equals arg1="${developer}" arg2="true" />
- </or>
- </condition>
-
- <condition property="predeploy-postgres" value="true">
- <and>
- <equals arg1="${predeploy}" arg2="true" />
- <equals arg1="${use-postgres}" arg2="true" />
- </and>
- </condition>
-
- <condition property="predeploy-oracle" value="true">
- <and>
- <equals arg1="${predeploy}" arg2="true" />
- <equals arg1="${use-oracle}" arg2="true" />
- </and>
- </condition>
-
- <condition property="predeploy-h2" value="true">
- <and>
- <equals arg1="${predeploy}" arg2="true" />
- <equals arg1="${use-h2}" arg2="true" />
- </and>
- </condition>
-
- <condition property="predeploy-sqlserver" value="true">
- <and>
- <equals arg1="${predeploy}" arg2="true" />
- <equals arg1="${use-sqlserver}" arg2="true" />
- </and>
- </condition>
-
- <!-- developers might want to deploy agent/server plugins frequently, so we'll scan every 30 seconds -->
- <!-- in production, plugins change very infrequently, so only scan every 5 minutes -->
- <condition property="rhq.server.plugin-scan-period-ms" value="30000">
- <or>
- <equals arg1="${dev.profile.active}" arg2="true" />
- <equals arg1="${developer}" arg2="true" />
- </or>
- </condition>
- <condition property="rhq.server.plugin-scan-period-ms" value="300000">
- <not>
- <or>
- <equals arg1="${dev.profile.active}" arg2="true" />
- <equals arg1="${developer}" arg2="true" />
- </or>
- </not>
- </condition>
-
- </target>
-
- <target name="prepare-container"
- depends="prepare-jbossas-dir,
- prepare-bin-dir" />
-
- <target name="prepare-jbossas-dir"
- depends="initialize"
- description="prepare JBossAS for hosting the RHQ Server">
-
- <echo>*** Preparing jbossas dir... ***</echo>
- <!-- Unzip vanilla JBoss dist zipfile... -->
- <property name="jboss.zip" location="${settings.localRepository}/org/jboss/jbossas/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip" />
- <condition property="jboss.uptodate">
- <and>
- <uptodate srcfile="${jboss.zip}" targetfile="${jboss.home}" />
- <available file="${jboss.home}/lib/jboss-system.jar" type="file" />
- </and>
- </condition>
- <antcall target="unzip-jboss" />
-
- <!-- Doublecheck that it's a valid JBoss dist... -->
- <available file="${jboss.home}/lib/jboss-system.jar" type="file" property="jboss.home.is.valid" />
- <fail unless="jboss.home.is.valid" message="${jboss.home} does not contain a valid JBoss 4.x installation - aborting..." />
-
- <echo/>
- <echo>Installing patched hibernate jar ...</echo>
- <copy file="${settings.localRepository}/hibernate/hibernate3/${hibernate3.version}/hibernate3-${hibernate3.version}.jar"
- tofile="${jboss.home}/server/default/lib/hibernate3.jar" verbose="true"/>
-
- <echo>Installing custom container library...</echo>
- <copy file="${settings.localRepository}/org/rhq/rhq-container-lib/${rhq.version}/rhq-container-lib-${rhq.version}.jar"
- tofile="${jboss.home}/server/default/lib/rhq-container-lib-${rhq.version}.jar" verbose="true"/>
-
- <property name="jboss.lib.dir" location="${jboss.home}/server/default/lib" />
- <echo>Copying additional libs to ${jboss.lib.dir} ...</echo>
- <copy file="${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar"
- toDir="${jboss.lib.dir}" failonerror="false" verbose="true" />
- <copy file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
- toDir="${jboss.lib.dir}" verbose="true" />
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
- toDir="${jboss.lib.dir}" verbose="true" />
- <!-- jtds for SQL Server support -->
- <copy file="${settings.localRepository}/net/sourceforge/jtds/jtds/${jtds.version}/jtds-${jtds.version}.jar"
- toDir="${jboss.lib.dir}" verbose="true" />
-
- <!-- Generate SSL key for RHQ server - 128-bit key that expires in 20 years... -->
- <property name="jboss.conf.dir" location="${jboss.home}/server/default/conf" />
- <available file="${jboss.conf.dir}/rhq.keystore" type="file" property="rhq.keystore.exists" />
- <antcall target="generate-rhq-ssl-key" />
-
- <!-- Delete the various working directories if they happen to exist... -->
- <delete dir="${jboss.home}/server/default/data" />
- <delete dir="${jboss.home}/server/default/log" />
- <delete dir="${jboss.home}/server/default/tmp" />
- <delete dir="${jboss.home}/server/default/work" />
-
- <!-- Delete unused stuff from deploy dir... -->
- <echo>Removing unwanted files from ${jboss.deploy.dir} ...</echo>
-
- <!-- remove Hypersonic -->
- <delete file="${jboss.deploy.dir}/hsqldb-ds.xml" />
- <delete dir="${jboss.deploy.dir}/juddi-service.sar" />
-
- <delete dir="${jboss.deploy.dir}/http-invoker.sar" />
- <delete dir="${jboss.deploy.dir}/jms/jbossmq-httpil.sar" />
- <delete quiet="true">
- <fileset dir="${jboss.deploy.dir}/jms">
- <include name="jbossmq-destinations-service.xml" />
- <include name="uil2-service.xml" />
- <include name="hsqldb-jdbc2-service.xml" /> <!-- no longer use Hypersonic for JMS backend -->
- </fileset>
- </delete>
-
- <delete dir="${jboss.deploy.dir}/uuid-key-generator.sar" />
- <delete file="${jboss.deploy.dir}/jboss-ha-local-jdbc.rar" />
- <delete file="${jboss.deploy.dir}/jboss-ha-xa-jdbc.rar" />
-
- <!-- Remove old web console, leave the JMX console (we will delete it later for releases) -->
- <delete dir="${jboss.deploy.dir}/management" />
-
- <echo>Upgrading JSF RI jars to v${jsf-impl.version} ...</echo>
- <property name="jsf-libs.dir" location="${jboss.deploy.dir}/jboss-web.deployer/jsf-libs" />
- <mkdir dir="${jsf-libs.dir}" />
- <delete>
- <fileset dir="${jsf-libs.dir}">
- <include name="jsf-impl*.jar" />
- <include name="jsf-api*.jar" />
- </fileset>
- </delete>
- <copy file="${settings.localRepository}/javax/faces/jsf-api/${jsf-api.version}/jsf-api-${jsf-api.version}.jar"
- tofile="${jsf-libs.dir}/jsf-api.jar" verbose="true" />
- <copy file="${settings.localRepository}/javax/faces/jsf-impl/${jsf-impl.version}/jsf-impl-${jsf-impl.version}.jar"
- tofile="${jsf-libs.dir}/jsf-impl.jar" verbose="true" />
-
- <echo>Upgrading Quartz to v${quartz.version} ...</echo>
- <copy file="${settings.localRepository}/org/opensymphony/quartz/quartz/${quartz.version}/quartz-${quartz.version}.jar"
- tofile="${jboss.home}/server/default/lib/quartz.jar" overwrite="true" verbose="true" />
- <copy file="${settings.localRepository}/org/opensymphony/quartz/quartz-oracle/${quartz.version}/quartz-oracle-${quartz.version}.jar"
- tofile="${jboss.home}/server/default/lib/quartz-oracle.jar" overwrite="true" verbose="true" />
-
- <echo>Upgrading Javassist from v3.8.0.GA to v${jboss-javassist.version} ...</echo>
- <copy file="${settings.localRepository}/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar"
- tofile="${jboss.home}/server/default/lib/javassist.jar" overwrite="true" verbose="true" />
- <copy file="${settings.localRepository}/javassist/javassist/${jboss-javassist.version}/javassist-${jboss-javassist.version}.jar"
- tofile="${jboss.home}/client/javassist.jar" overwrite="true" verbose="true" />
-
- <echo>Preparing JMS backend ...</echo>
- <mkdir dir="${jboss.deploy.dir}/jms" />
- <copy todir="${jboss.deploy.dir}/${jms.oracle.dir}">
- <fileset dir="${jboss.deploy.dir}/jms" />
- </copy>
- <copy todir="${jboss.deploy.dir}/${jms.postgres.dir}">
- <fileset dir="${jboss.deploy.dir}/jms" />
- </copy>
- <copy todir="${jboss.deploy.dir}/${jms.h2.dir}">
- <fileset dir="${jboss.deploy.dir}/jms" />
- </copy>
- <copy todir="${jboss.deploy.dir}/${jms.sqlserver.dir}">
- <fileset dir="${jboss.deploy.dir}/jms" />
- </copy>
- <antcall target="setup-jms-backend" />
-
- <echo>Deploying ${rhq.earName} ...</echo>
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}" />
- <unjar src="${settings.localRepository}/org/rhq/rhq-enterprise-server-ear/${rhq.version}/rhq-enterprise-server-ear-${rhq.version}.ear"
- dest="${jboss.deploy.dir}/${rhq.earName}" />
-
- <echo>Removing Tomcat ROOT.war to prepare for RHQ replacement ...</echo>
- <delete dir="${jboss.deploy.dir}/jboss-web.deployer/ROOT.war" />
-
- <echo>Deploying installer webapp ...</echo>
- <mkdir dir="${jboss.deploy.dir}/rhq-installer.war" />
- <unwar src="${settings.localRepository}/org/rhq/rhq-installer/${rhq.version}/rhq-installer-${rhq.version}.war"
- dest="${jboss.deploy.dir}/rhq-installer.war" />
-
- <echo>Deploying embedded agent sar ...</echo>
- <unjar src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar"
- dest="${jboss.deploy.dir}/rhq-agent.sar" />
-
- <echo>Deploying RT filter jar ...</echo>
- <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${rhq.version}/rhq-rtfilter-${rhq.version}.jar"
- todir="${jboss.home}/server/default/lib" verbose="true" />
-
- <!-- Delete docs dir and README files... -->
- <delete dir="${jboss.home}/docs" />
- <delete>
- <fileset dir="${jboss.home}" includes="*.*" />
- </delete>
-
- <!-- make sure the top level downloads directory exists -->
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads" />
-
- <!-- deploy all the static downloadable content -->
- <echo>Deploying static downloadable content...</echo>
- <copy todir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads"
- verbose="true"
- failonerror="false">
- <fileset dir="${basedir}/src/main/downloadable-resources" />
- </copy>
-
- <!-- make sure our downloads directories exist -->
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent" />
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-client" />
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-plugins" />
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors" />
- <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/bundle-deployer" />
-
- <!-- deploy the agent update binary to the downloads location -->
- <echo>Deploying the latest agent update binary and renaming it rhq-enterprise-agent-${rhq.version}.jar</echo>
- <copy file="${settings.localRepository}/org/rhq/rhq-enterprise-agentupdate/${rhq.version}/rhq-enterprise-agentupdate-${rhq.version}.jar"
- tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent/rhq-enterprise-agent-${rhq.version}.jar"
- verbose="true"
- failonerror="true"/>
-
- <!-- deploy the remote client binary to the downloads location. -->
- <echo>Deploying the latest remote client binary</echo>
- <copy file="${settings.localRepository}/org/rhq/rhq-remoting-cli/${rhq.version}/rhq-remoting-cli-${rhq.version}.zip"
- tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-client/rhq-remoting-cli-${rhq.version}.zip"
- verbose="true"
- failonerror="false"/>
-
- <!-- deploy the command-line bundle deployer (Ant launcher) to the downloads location. -->
- <echo>Deploying the latest command-line bundle deployer</echo>
- <copy file="${settings.localRepository}/org/rhq/rhq-ant-bundle-common/${rhq.version}/rhq-ant-bundle-common-${rhq.version}.zip"
- tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/bundle-deployer/rhq-bundle-deployer-${rhq.version}.zip"
- verbose="true"
- failonerror="false"/>
-
- <!-- optionally package the connectors -->
- <antcall target="package-connectors" />
-
- <echo>Enabling server to run on Java 6 ...</echo>
- <move todir="${jboss.home}/lib/endorsed" verbose="true">
- <fileset dir="${jboss.home}/client">
- <include name="jboss-jaxrpc.jar" />
- <include name="jboss-saaj.jar" />
- <include name="jaxb-api.jar" />
- </fileset>
- <fileset dir="${jboss.home}/server/default/lib">
- <include name="activation.jar" />
- </fileset>
- </move>
-
- <!-- Having xalan.jar in lib/endorsed/ causes issues with some version of Sun Java,
- so remove it by default, but hold onto it, since we'll need to put it back
- when using IBM Java. -->
- <mkdir dir="${project.build.outputDirectory}/etc/ibm" />
- <move file="${jboss.home}/lib/endorsed/xalan.jar"
- todir="${project.build.outputDirectory}/etc/ibm"
- failonerror="false" />
-
- <echo>Adding support for the embedded agent ...</echo>
- <move todir="${jboss.home}/lib/endorsed" verbose="true">
- <fileset dir="${jboss.home}/client">
- <include name="jaxb-impl.jar" />
- </fileset>
- </move>
-
- <!-- see BZ-820629 and CVE-2009-2625 for why this is needed -->
- <echo>Overlaying a more secure xercesImpl.jar</echo>
- <copy file="${settings.localRepository}/xerces/xercesImpl/${xercesImpl.version}/xercesImpl-${xercesImpl.version}.jar"
- tofile="${jboss.home}/lib/endorsed/xercesImpl.jar"
- verbose="true" />
-
- </target>
-
- <target name="package-connectors">
- <echo>Deploying the response-time (RT) servlet filter connectors ...</echo>
- <delete file="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip" />
- <zip destfile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip">
- <zipfileset dir="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}">
- <include name="rhq-rtfilter-${project.version}.jar" />
- </zipfileset>
- <zipfileset dir="${settings.localRepository}/commons-logging/commons-logging/1.1.1">
- <include name="commons-logging-1.1.1.jar" />
- </zipfileset>
- </zip>
-
- <!-- rtfilter AS7 modules -->
- <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}/rhq-rtfilter-${project.version}.zip"
- tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-module.zip" />
-
- <copy file="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter-subsystem/${project.version}/rhq-rtfilter-subsystem-${project.version}.zip"
- tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/rhq-rtfilter-subsystem-module.zip" />
- </target>
-
- <target name="prepare-bin-dir">
- <echo>*** Preparing bin dir... ***</echo>
- <echo>connection URL is ${rhq.server.database.connection-url}</echo>
- <property name="rhq.bin.dir" location="${project.build.outputDirectory}/bin" />
-
- <mkdir dir="${rhq.bin.dir}" />
- <echo file="${rhq.bin.dir}/rhq-server.properties">### RHQ Server Configuration Properties
-
-# Database
-rhq.server.database.connection-url=${rhq.server.database.connection-url}
-rhq.server.database.driver-class=${rhq.server.database.driver-class}
-rhq.server.database.xa-datasource-class=${rhq.server.database.xa-datasource-class}
-rhq.server.database.user-name=${rhq.server.database.user-name}
-rhq.server.database.password=${rhq.server.database.password}
-rhq.server.database.type-mapping=${rhq.server.database.type-mapping}
-rhq.server.database.server-name=${rhq.server.database.server-name}
-rhq.server.database.port=${rhq.server.database.port}
-rhq.server.database.db-name=${rhq.server.database.db-name}
-hibernate.dialect=${rhq.server.database.hibernate-dialect}
-
-# Quartz
-rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass}
-rhq.server.quartz.selectWithLockSQL=${rhq.server.quartz.selectWithLockSQL}
-rhq.server.quartz.lockHandlerClass=${rhq.server.quartz.lockHandlerClass}
-
-# Container configuration
-# ********************************** NOTE ************************************
-# If the jboss.bind.address property is set to anything besides 0.0.0.0,
-# uncomment the java.rmi.server.hostname property below and set it to the same
-# value - setting it to ${jboss.bind.address} will *not* work.
-jboss.bind.address=0.0.0.0
-#java.rmi.server.hostname=0.0.0.0
-
-# High Availability (HA)
-rhq.server.high-availability.name=
-rhq.server.maintenance-mode-at-startup=false
-
-# General Properties
-rhq.server.startup.web.http.port=${rhq.server.http.port}
-rhq.server.startup.web.https.port=${rhq.server.https.port}
-rhq.server.startup.namingservice.port=2099
-rhq.server.startup.namingservice.rmiport=2098
-rhq.server.startup.jrmpinvoker.rmiport=7444
-rhq.server.startup.pooledinvoker.rmiport=7445
-rhq.server.startup.ajp.port=9009
-rhq.server.startup.unifiedinvoker.port=5446
-rhq.server.startup.aspectdeployer.bind-port=4873
-
-# RHQ Server's remote endpoint for agents to talk to
-# bind-address and bind-port are derived from the HA server definition,
-# if you set the address/port here, they will override the HA server definition found in the database
-rhq.communications.connector.transport=servlet
-rhq.communications.connector.bind-address=
-rhq.communications.connector.bind-port=
-rhq.communications.connector.transport-params=/jboss-remoting-servlet-invoker/ServerInvokerServlet
-
-# Multicast detector configuration for auto-discovery
-rhq.communications.multicast-detector.enabled=false
-rhq.communications.multicast-detector.bind-address=${jboss.bind.address}
-rhq.communications.multicast-detector.multicast-address=224.16.16.16
-rhq.communications.multicast-detector.port=16162
-
-# Server-side SSL Security Configuration for HTTPS thru Tomcat
-# These are used for browser https: access and for incoming messages from agents over sslservlet transport
-# [you cannot use ${x} variables - see https://jira.jboss.org/jira/browse/JBWEB-74]
-rhq.server.tomcat.security.client-auth-mode=want
-rhq.server.tomcat.security.secure-socket-protocol=TLS
-rhq.server.tomcat.security.algorithm=SunX509
-rhq.server.tomcat.security.keystore.alias=RHQ
-rhq.server.tomcat.security.keystore.file=conf/rhq.keystore
-rhq.server.tomcat.security.keystore.password=RHQManagement
-rhq.server.tomcat.security.keystore.type=JKS
-rhq.server.tomcat.security.truststore.file=conf/rhq.truststore
-rhq.server.tomcat.security.truststore.password=RHQManagement
-rhq.server.tomcat.security.truststore.type=JKS
-
-# Server-side SSL Security Configuration (for incoming messages from agents)
-# These are used when secure transports other than sslservlet are used
-rhq.communications.connector.security.secure-socket-protocol=TLS
-rhq.communications.connector.security.keystore.file=${jboss.server.home.dir}/conf/rhq.keystore
-rhq.communications.connector.security.keystore.algorithm=SunX509
-rhq.communications.connector.security.keystore.type=JKS
-rhq.communications.connector.security.keystore.password=RHQManagement
-rhq.communications.connector.security.keystore.key-password=RHQManagement
-rhq.communications.connector.security.keystore.alias=RHQ
-rhq.communications.connector.security.truststore.file=${jboss.server.home.dir}/conf/rhq.truststore
-rhq.communications.connector.security.truststore.algorithm=SunX509
-rhq.communications.connector.security.truststore.type=JKS
-rhq.communications.connector.security.truststore.password=RHQManagement
-rhq.communications.connector.security.client-auth-mode=none
-
-# Client-side SSL Security Configuration (for outgoing messages to agents)
-rhq.server.client.security.secure-socket-protocol=TLS
-rhq.server.client.security.keystore.file=${jboss.server.home.dir}/conf/rhq.keystore
-rhq.server.client.security.keystore.algorithm=SunX509
-rhq.server.client.security.keystore.type=JKS
-rhq.server.client.security.keystore.password=RHQManagement
-rhq.server.client.security.keystore.key-password=RHQManagement
-rhq.server.client.security.keystore.alias=RHQ
-rhq.server.client.security.truststore.file=${jboss.server.home.dir}/conf/rhq.truststore
-rhq.server.client.security.truststore.algorithm=SunX509
-rhq.server.client.security.truststore.type=JKS
-rhq.server.client.security.truststore.password=RHQManagement
-rhq.server.client.security.server-auth-mode-enabled=false
-
-# Embedded RHQ Agent
-rhq.server.embedded-agent.enabled=false
-rhq.server.embedded-agent.name=
-rhq.server.embedded-agent.reset-configuration=true
-rhq.server.embedded-agent.disable-native-system=false
-
-# Email
-rhq.server.email.smtp-host=localhost
-rhq.server.email.smtp-port=25
-rhq.server.email.from-address=rhqadmin@localhost
-
-# Operations/controls timeout
-# Defines the default timeout for all operations (specified in seconds)
-rhq.server.operation-timeout=600
-
-# Concurrency limits for incoming UI and agent messages
-rhq.server.startup.web.max-connections=200
-rhq.server.agent-downloads-limit=45
-rhq.server.client-downloads-limit=5
-rhq.communications.global-concurrency-limit=30
-rhq.server.concurrency-limit.inventory-report=5
-rhq.server.concurrency-limit.availability-report=25
-rhq.server.concurrency-limit.inventory-sync=10
-rhq.server.concurrency-limit.content-report=5
-rhq.server.concurrency-limit.content-download=5
-rhq.server.concurrency-limit.measurement-report=10
-rhq.server.concurrency-limit.measurement-schedule-request=10
-
-# Content Local Filesystem Repository
-rhq.server.content.filesystem=${jboss.server.data.dir}/packagebits
-
-# The frequency (in millis) the server checks for updated plugins
-rhq.server.plugin-scan-period-ms=${rhq.server.plugin-scan-period-ms}
-
-# When this is enabled, the server at start up will compare its endpoint
-# address to the host name/address found on the host machine. If they differ,
-# the server endpoint address will be updated to the value found on the host
-# machine. This is targeted for use in cloud deployments where IP addresses
-# change frequently, but it can be of use in other deployment settings where
-# you have to deal with IP address changes.
-rhq.sync.endpoint-address=false
-
-# When this is enabled, the server will request that agents send content for
-# for binary files that are being monitored for drift. The content for those
-# files will then be persisted on the server. By default, the server does not
-# persist content for well known binary file types like .ear, .war, .zip, .so,
-# etc. The server does however persist content for text files or any other
-# files that are not known binary types.
-# rhq.server.drift.store-binary-content=${rhq.server.drift.store-binary-content}
-
-# Auto-Install Pre-Configuration Settings
-# If you wish to circumvent the installer webapp and auto-install the server
-# immediately upon first startup, make sure all of the settings above are
-# correctly set for your server's deployment environment. Then make sure the
-# following rhq.autoinstall properties are defined appropriately:
-# rhq.autoinstall.enabled: must be true to trigger the automatic install
-# rhq.autoinstall.database: allowed values: auto, overwrite, skip
-# "auto" will create a new schema if one does not
-# yet exist or, if a schema does exist, will simply
-# upgrade it as needed (which keeps existing data).
-# "overwrite" if you want to create an empty schema,
-# even if one already exists (loses existing data).
-# "skip" if you don't want to do any database
-# upgrade or creation. WARNING! You must ensure your
-# database schema already exists and is up to date.
-# rhq.autoinstall.public-endpoint-address: public IP/hostname that all agents
-# will use to talk to this server.
-# If not set, a value to use is
-# determined at auto-install time.
-rhq.autoinstall.enabled=false
-rhq.autoinstall.database=auto
-rhq.autoinstall.public-endpoint-address=
-
-</echo>
-
- </target>
-
- <target name="unzip-jboss" unless="jboss.uptodate">
- <unzip src="${settings.localRepository}/org/jboss/jbossas/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip"
- dest="${basedir}/target" />
- <delete dir="${jboss.home}" />
- <move file="${basedir}/target/jboss-${jboss.version}" tofile="${jboss.home}" />
-
- <echo>Installing jgroups jar ...</echo>
- <copy file="${jboss.home}/server/all/lib/jgroups.jar"
- tofile="${jboss.home}/server/default/lib/jgroups.jar" verbose="true"/>
-
- <echo>Installing jboss cache jar ...</echo>
- <copy file="${jboss.home}/server/all/lib/jboss-cache-jdk50.jar"
- tofile="${jboss.home}/server/default/lib/jboss-cache-jdk50.jar" verbose="true"/>
-
- <!-- Delete 'minimal' and 'all' config dirs... -->
- <delete dir="${jboss.home}/server/minimal" />
- <delete dir="${jboss.home}/server/all" />
- <delete file="${jboss.home}/server/default/deploy/quartz-ra.rar" />
- </target>
-
-
- <target name="generate-rhq-ssl-key" unless="rhq.keystore.exists">
- <echo>Generating self-signed certificate in ${jboss.conf.dir} ...</echo>
- <genkey alias="RHQ"
- keystore="${jboss.conf.dir}/rhq.keystore"
- keyalg="rsa"
- storepass="RHQManagement"
- validity="7300"
- dname="CN=RHQ, OU=RHQ, O=rhq-project.org, C=US" />
- <!-- the rhq.truststore is pre-built and checked into SVN. It is empty with the same store pass as above -->
- </target>
-
- <target name="setup-jms-backend"
- depends="setup-jms-backend-postgres,
- setup-jms-backend-oracle,
- setup-jms-backend-h2,
- setup-jms-backend-sqlserver,
- make-default-jms-backend-postgres,
- make-default-jms-backend-oracle,
- make-default-jms-backend-h2,
- make-default-jms-backend-sqlserver">
- </target>
-
- <target name="setup-jms-backend-postgres">
- <echo>Preparing the Postgres JMS configuration...</echo>
- <move file="${jboss.deploy.dir}/${jms.postgres.dir}/hsqldb-jdbc-state-service.xml"
- tofile="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc-state-service.xml" verbose="true" failonerror="false"/>
- <replace file="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc-state-service.xml" token="DefaultDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc-state-service.xml"
- token="CREATE_TABLES_ON_STARTUP = TRUE"
- value="CREATE_TABLES_ON_STARTUP = FALSE"/>
- <copy file="${jboss.home}/docs/examples/jms/postgres-jdbc2-service.xml"
- tofile="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc2-service.xml" verbose="true" failonerror="false" />
- <replace file="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc2-service.xml" token="PostgresDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.postgres.dir}/rhq-jdbc2-service.xml"
- token="CREATE_TABLES_ON_STARTUP = TRUE"
- value="CREATE_TABLES_ON_STARTUP = FALSE" />
- </target>
-
- <target name="make-default-jms-backend-postgres" if="use-postgres">
- <echo>Postgres will be your JMS backend!</echo>
- <delete dir="${jboss.deploy.dir}/jms" />
- <copy todir="${jboss.deploy.dir}/jms">
- <fileset dir="${jboss.deploy.dir}/${jms.postgres.dir}" />
- </copy>
- </target>
-
- <target name="setup-jms-backend-oracle">
- <echo>Preparing the Oracle JMS configuration...</echo>
- <move file="${jboss.deploy.dir}/${jms.oracle.dir}/hsqldb-jdbc-state-service.xml"
- tofile="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc-state-service.xml" verbose="true" failonerror="false"/>
- <replace file="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc-state-service.xml" token="DefaultDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc-state-service.xml"
- token="CREATE_TABLES_ON_STARTUP = TRUE"
- value="CREATE_TABLES_ON_STARTUP = FALSE"/>
- <copy file="${jboss.home}/docs/examples/jms/oracle-jdbc2-service.xml"
- tofile="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc2-service.xml" verbose="true" failonerror="false" />
- <replace file="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc2-service.xml" token="OracleDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.oracle.dir}/rhq-jdbc2-service.xml"
- token="CREATE_TABLES_ON_STARTUP = TRUE"
- value="CREATE_TABLES_ON_STARTUP = FALSE"/>
- </target>
-
- <target name="make-default-jms-backend-oracle" if="use-oracle">
- <echo>Oracle will be your JMS backend!</echo>
- <delete dir="${jboss.deploy.dir}/jms" />
- <copy todir="${jboss.deploy.dir}/jms">
- <fileset dir="${jboss.deploy.dir}/${jms.oracle.dir}" />
- </copy>
- </target>
-
- <target name="setup-jms-backend-h2">
- <echo>Preparing the H2 JMS configuration...</echo>
- <move file="${jboss.deploy.dir}/${jms.h2.dir}/hsqldb-jdbc-state-service.xml"
- tofile="${jboss.deploy.dir}/${jms.h2.dir}/rhq-jdbc-state-service.xml" verbose="true" failonerror="false"/>
- <replace file="${jboss.deploy.dir}/${jms.h2.dir}/rhq-jdbc-state-service.xml" token="DefaultDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.h2.dir}/rhq-jdbc-state-service.xml" token="CREATE_TABLES_ON_STARTUP = TRUE" value="CREATE_TABLES_ON_STARTUP = FALSE" />
- <!-- since JBossAS distro did not provide a samples for the H2 database, this file was prepared in
- resources/jbossas/server/default/${jms.h2.dir}/rhq-jdbc2-service.xml and will be copied to
- ${jboss.deploy.dir}/${jms.h2.dir}/rhq-jdbc2-service.xml directly; it needs to be copied now
- because if H2 is the chosen JMS backend this file needs to exist in the target directory so
- it can be copied to the 'jms' directory in time -->
- <copy file="src/main/resources/jbossas/server/default/deploy/${jms.h2.dir}/rhq-jdbc2-service.xml" tofile="${jboss.deploy.dir}/${jms.h2.dir}/rhq-jdbc2-service.xml" verbose="true" failonerror="false" />
- </target>
-
- <target name="make-default-jms-backend-h2" if="use-h2">
- <echo>H2 will be your JMS backend!</echo>
- <delete dir="${jboss.deploy.dir}/jms" />
- <copy todir="${jboss.deploy.dir}/jms">
- <fileset dir="${jboss.deploy.dir}/${jms.h2.dir}" />
- </copy>
- </target>
-
- <target name="setup-jms-backend-sqlserver">
- <echo>Preparing the SQL Server JMS configuration...</echo>
- <move file="${jboss.deploy.dir}/${jms.sqlserver.dir}/hsqldb-jdbc-state-service.xml" tofile="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc-state-service.xml" verbose="true" failonerror="false" />
- <replace file="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc-state-service.xml" token="DefaultDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc-state-service.xml" token="CREATE_TABLES_ON_STARTUP = TRUE" value="CREATE_TABLES_ON_STARTUP = FALSE" />
- <copy file="${jboss.home}/docs/examples/jms/mssql-jdbc2-service.xml" tofile="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc2-service.xml" verbose="true" failonerror="false" />
- <replace file="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc2-service.xml" token="MSSQLDS" value="RHQDS" />
- <replace file="${jboss.deploy.dir}/${jms.sqlserver.dir}/rhq-jdbc2-service.xml" token="CREATE_TABLES_ON_STARTUP = TRUE" value="CREATE_TABLES_ON_STARTUP = FALSE" />
- </target>
-
- <target name="make-default-jms-backend-sqlserver" if="use-sqlserver">
- <echo>SQL Server will be your JMS backend!</echo>
- <delete dir="${jboss.deploy.dir}/jms" />
- <copy todir="${jboss.deploy.dir}/jms">
- <fileset dir="${jboss.deploy.dir}/${jms.sqlserver.dir}" />
- </copy>
- </target>
-
- <target name="copy-dev-resources" if="copy.dev.resources">
- <echo>Copying dev-only resources ...</echo>
- <copy todir="${project.build.outputDirectory}" verbose="true">
- <fileset dir="src/main/dev-resources" />
- </copy>
- <echo>Putting a developer setting in rhq-server.properties to turn on/off strict agent update version checking</echo>
- <echo file="${project.build.outputDirectory}/bin/rhq-server.properties" append="true">rhq.server.agent-update.nonstrict-version-check=true</echo>
- </target>
-
- <!-- The prepare-release target must be run AFTER the resources:resources goal has executed. -->
- <!-- (i.e. after rhq-ds.xml, rhq-server.sh, etc. have been copied over by the resources plugin) -->
-
- <target name="prepare-release" depends="initialize,
- fix-perms,
- prepare-postinstaller-war,
- developer-release-message,
- copy-dev-resources,
- process-ds-files,
- deploy-postgres-ds,
- deploy-oracle-ds,
- deploy-h2-ds,
- deploy-sqlserver-ds,
- undeploy-jmx-console,
- undeploy-mail-service,
- undeploy-cluster-service,
- undeploy-mdb-service,
- undeploy-embedded-agent,
- undeploy-jms,
- undeploy-ear,
- undeploy-ds" description="If this is a release build, make sure it is properly prepared.">
-
- <echo>Adding license files...</echo>
- <copy todir="${project.build.outputDirectory}">
- <fileset dir="${basedir}/../../../.." includes="LICENSE*" />
- </copy>
- </target>
-
- <target name="fix-perms">
- <!-- Make sure shell scripts are readable and executable. -->
- <chmod dir="${project.build.outputDirectory}/bin" includes="*.sh" perm="ug+x" verbose="true" />
- <chmod dir="${jboss.home}/bin" includes="*.sh" perm="ug+x" verbose="true" />
- </target>
-
- <target name="prepare-postinstaller-war">
- <!-- nothing to do here - leaving in case we need to perform things in the future -->
- </target>
-
- <target name="process-ds-files">
- <!-- nothing to do here - leaving in case we need to perform things in the future -->
- </target>
-
- <target name="developer-release-message" if="predeploy">
- <echo>!!THIS IS A DEVELOPER CONTAINER BUILD - PRE-DEPLOYING RHQ SERVER!!</echo>
- </target>
-
- <target name="undeploy-jms" unless="predeploy">
- <echo>Preparing for release - undeploying JMS...</echo>
- <delete dir="${jboss.deploy.dir}/jms" />
- </target>
-
- <target name="undeploy-jmx-console" unless="predeploy">
- <echo>Preparing for release - undeploying JMX Console...</echo>
- <!-- TODO: do we want to completely delete it? right now I just disable it so we can re-enable out in the field
- <delete dir="${jboss.deploy.dir}/jmx-console.war" />
- -->
- <move file="${jboss.deploy.dir}/jmx-console.war" tofile="${jboss.deploy.dir}/jmx-console.war.rej" failonerror="false" />
- <!-- fix security-constraint -->
- <copy file="${basedir}/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml"
- toDir="${jboss.deploy.dir}/jmx-console.war.rej/WEB-INF" verbose="true" />
-
- </target>
-
- <target name="undeploy-mail-service" unless="predeploy">
- <echo>Preparing for release - undeploying Mail Service...</echo>
- <move file="${jboss.deploy.dir}/mail-service.xml" tofile="${jboss.deploy.dir}/mail-service.xml.rej" failonerror="false" />
- </target>
-
- <!-- Removing cluster service in 1.1, potentially adding back later for cluster management support
- dev profile or not, we always want to execute this target so remove the 'unless' attribute;
- do not fail on error, because we don't want to fail if the file has already been renamed -->
- <target name="undeploy-cluster-service">
- <echo>Undeploying Cluster Service...</echo>
- <move file="${jboss.deploy.dir}/cluster-service.xml" tofile="${jboss.deploy.dir}/cluster-service.xml.rej" failonerror="false" />
- </target>
-
- <target name="undeploy-mdb-service" unless="predeploy">
- <echo>Preparing for release - undeploying RHQ MDB Service...</echo>
- <move file="${jboss.deploy.dir}/rhq-mdb-service.xml" tofile="${jboss.deploy.dir}/rhq-mdb-service.xml.rej" failonerror="false" />
- </target>
-
- <target name="undeploy-embedded-agent" unless="predeploy">
- <echo>Preparing for release - undeploying Embedded Agent...</echo>
- <move file="${jboss.deploy.dir}/rhq-agent.sar" tofile="${jboss.deploy.dir}/rhq-agent.sar.rej" />
- </target>
-
- <target name="undeploy-ear" unless="predeploy">
- <echo>Preparing for release - cleaning and undeploying EAR...</echo>
- <move file="${jboss.deploy.dir}/${rhq.earName}" tofile="${jboss.deploy.dir}/${rhq.earName}.rej" />
- </target>
-
- <target name="undeploy-ds" unless="predeploy">
- <echo>Preparing for release - making sure Data Source is not deployed...</echo>
- <delete file="${jboss.deploy.dir}/rhq-ds.xml" />
- </target>
-
- <target name="deploy-postgres-ds" if="predeploy-postgres">
- <echo>Postgres will be your datasource backend!</echo>
- <copy file="${jboss.deploy.dir}/${ds.postgres.file}" tofile="${jboss.deploy.dir}/rhq-ds.xml" verbose="true" />
- </target>
-
- <target name="deploy-oracle-ds" if="predeploy-oracle">
- <echo>Oracle will be your datasource backend!</echo>
- <copy file="${jboss.deploy.dir}/${ds.oracle.file}" tofile="${jboss.deploy.dir}/rhq-ds.xml" verbose="true" />
- </target>
-
- <target name="deploy-h2-ds" if="predeploy-h2">
- <echo>H2 will be your datasource backend!</echo>
- <copy file="${jboss.deploy.dir}/${ds.h2.file}" tofile="${jboss.deploy.dir}/rhq-ds.xml" verbose="true" />
- </target>
-
- <target name="deploy-sqlserver-ds" if="predeploy-sqlserver">
- <echo>SQL Server will be your datasource backend!</echo>
- <copy file="${jboss.deploy.dir}/${ds.sqlserver.file}" tofile="${jboss.deploy.dir}/rhq-ds.xml" verbose="true" />
- </target>
-
-</project>
-
diff --git a/modules/enterprise/server/container/src/main/shell/zip_all_plugins b/modules/enterprise/server/container/src/main/shell/zip_all_plugins
deleted file mode 100755
index dd823b6..0000000
--- a/modules/enterprise/server/container/src/main/shell/zip_all_plugins
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rm -rf rhq-plugin-pack-all-SNAPSHOT.zip
-zip -r1 rhq-plugin-pack-all-SNAPSHOT.zip plugins/* enterprise/server/plugins/* -i *.jar
commit 18f1ba5a752da425460441a46366870370d230e6
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Sep 26 11:18:32 2012 -0400
Update script updated in obsolete container module
diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
index 5dba002..f520488 100644
--- a/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
+++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
@@ -1,10 +1,6 @@
/**
* Using this script one can automatically reset a bundle deployment to a specified version.
*
- * This script consists of several utility methods originally included in standalone files
- * in the samples of the CLI distribution, which have been included in this file so that it
- * is usable on its own even in the server environment.
- *
* The configuration of the bundle and its version to reset to is located at the top of this file.
* Please provide the values to the variables as instructed to make this script work in
* a concrete situation.
@@ -70,415 +66,8 @@ var description = "redeploy due to drift";
// original versions from the bundle.
var isCleanDeployment = true;
-//-------------------- util.js
-
-/**
- * If obj is a JS array or a java.util.Collection, each element is passed to
- * the callback function. If obj is a java.util.Map, each map entry is passed
- * to the callback function as a key/value pair. If obj is none of the
- * aforementioned types, it is treated as a generic object and each of its
- * properties is passed to the callback function as a name/value pair.
- */
-function foreach(obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- fn(obj[i]);
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- fn(iterator.next());
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator()
- while (iterator.hasNext()) {
- var entry = iterator.next();
- fn(entry.key, entry.value);
- }
- }
- else { // assume we have a generic object
- for (i in obj) {
- fn(i, obj[i]);
- }
- }
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. The first match that is found is returned.
- */
-function find(obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- if (fn(obj[i])) {
- return obj[i]
- }
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- var next = iterator.next();
- if (fn(next)) {
- return next;
- }
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator();
- while (iterator.hasNext()) {
- var entry = iterator.next();
- if (fn(entry.key, entry.value)) {
- return {key: entry.key, value: entry.value};
- }
- }
- }
- else {
- for (i in obj) {
- if (fn(i, obj[i])) {
- return {key: i, value: obj[i]};
- }
- }
- }
- return null;
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. All of the matches are returned in a java.util.List.
- */
-function findAll(obj, fn) {
- var matches = java.util.ArrayList();
- if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
- foreach(obj, function(element) {
- if (fn(element)) {
- matches.add(element);
- }
- });
- }
- else {
- foreach(obj, function(key, value) {
- if (fn(theKey, theValue)) {
- matches.add({key: theKey, value: theValue});
- }
- });
- }
- return matches;
-}
-
-/**
- * A convenience function to convert javascript hashes into RHQ's configuration
- * objects.
- * <p>
- * The conversion of individual keys in the hash follows these rules:
- * <ol>
- * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
- * <li> if a value is a hash, it is interpreted as a PropertyMap
- * <li> otherwise it is interpreted as a PropertySimple
- * <li> a null or undefined value is ignored
- * </ol>
- * <p>
- * Note that the conversion isn't perfect, because the hash does not contain enough
- * information to restore the names of the list members.
- * <p>
- * Example: <br/>
- * <pre><code>
- * {
- * simple : "value",
- * list : [ "value1", "value2"],
- * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
- * }
- * </code></pre>
- * gets converted to a configuration object:
- * Configuration:
- * <ul>
- * <li> PropertySimple(name = "simple", value = "value")
- * <li> PropertyList(name = "list")
- * <ol>
- * <li>PropertySimple(name = "list", value = "value1")
- * <li>PropertySimple(name = "list", value = "value2")
- * </ol>
- * <li> PropertyList(name = "listOfMaps")
- * <ol>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value")
- * <li>PropertySimple(name = "k2", value = "value")
- * </ul>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value2")
- * <li>PropertySimple(name = "k2", value = "value2")
- * </ul>
- * </ol>
- * </ul>
- * Notice that the members of the list have the same name as the list itself
- * which generally is not the case.
- */
-function asConfiguration(hash) {
-
- config = new Configuration;
-
- for(key in hash) {
- value = hash[key];
-
- if (value == null) {
- continue;
- }
-
- (function(parent, key, value) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- function isPrimitive(obj) {
- return typeof(obj) != 'object';
- }
-
- //this is an anonymous function, so the only way it can call itself
- //is by getting its reference via argument.callee. Let's just assign
- //a shorter name for it.
- var me = arguments.callee;
-
- var prop = null;
-
- if (isPrimitive(value)) {
- prop = new PropertySimple(key, new java.lang.String(value));
- } else if (isArray(value)) {
- prop = new PropertyList(key);
- for(var i = 0; i < value.length; ++i) {
- var v = value[i];
- if (v != null) {
- me(prop, key, v);
- }
- }
- } else if (isHash(value)) {
- prop = new PropertyMap(key);
- for(var i in value) {
- var v = value[i];
- if (value != null) {
- me(prop, i, v);
- }
- }
- }
-
- if (parent instanceof PropertyList) {
- parent.add(prop);
- } else {
- parent.put(prop);
- }
- })(config, key, value);
- }
-
- return config;
-}
-
-/**
- * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
- * into a javascript hash.
- *
- * @param configuration
- */
-function asHash(configuration) {
- ret = {}
-
- iterator = configuration.getMap().values().iterator();
- while(iterator.hasNext()) {
- prop = iterator.next();
-
- (function(parent, prop) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- var me = arguments.callee;
-
- var representation = null;
-
- if (prop instanceof PropertySimple) {
- representation = prop.stringValue;
- } else if (prop instanceof PropertyList) {
- representation = [];
-
- for(var i = 0; i < prop.list.size(); ++i) {
- var child = prop.list.get(i);
- me(representation, child);
- }
- } else if (prop instanceof PropertyMap) {
- representation = {};
-
- var childIterator = prop.getMap().values().iterator();
- while(childIterator.hasNext()) {
- var child = childIterator.next();
-
- me(representation, child);
- }
- }
-
- if (isArray(parent)) {
- parent.push(representation);
- } else if (isHash(parent)) {
- parent[prop.name] = representation;
- }
- })(ret, prop);
- }
- (function(parent) {
-
- })(configuration);
-
- return ret;
-}
-
-//------------------------------ bundles.js
-
-/**
- * A simple function to create a new bundle version from a zip file containing
- * the bundle.
- *
- * @param pathToBundleZipFile the path to the bundle on the local file system
- *
- * @return an instance of BundleVersion class describing what's been created on
- * the RHQ server.
- */
-function createBundleVersion(pathToBundleZipFile) {
- var bytes = getFileBytes(pathToBundleZipFile)
- return BundleManager.createBundleVersionViaByteArray(bytes)
-}
-
-/**
- * This is a helper function that one can use to find out what base directories
- * given resource type defines.
- * <p>
- * These base directories then can be used when specifying bundle destinations.
- *
- * @param resourceTypeId
- * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
- */
-function getAllBaseDirectories(resourceTypeId) {
- var crit = new ResourceTypeCriteria;
- crit.addFilterId(resourceTypeId);
- crit.fetchBundleConfiguration(true);
-
- var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
-
- if (types.size() == 0) {
- throw "Could not find a resource type with id " + resourceTypeId;
- } else if (types.size() > 1) {
- throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
- }
-
- var type = types.get(0);
-
- return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
-}
-
-/**
- * Creates a new destination for given bundle. Once a destination exists,
- * actual bundle versions can be deployed to it.
- * <p>
- * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
- * method in the fact that one can provide bundle and resource group names instead of their
- * ids.
- *
- * @param destinationName the name of the destination to be created
- * @param description the description for the destination
- * @param bundleName the name of the bundle to create the destination for
- * @param groupName name of a group of resources that the destination will handle
- * @param baseDirName the name of the basedir definition that represents where inside the
- * deployment of the individual resources the bundle will get deployed
- * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
- *
- * @return BundleDestination object
- */
-function createBundleDestination(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
- var groupCrit = new ResourceGroupCriteria;
- groupCrit.addFilterName(groupName);
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
-
- if (groups.empty) {
- throw "No group called '" + groupName + "' found.";
- }
-
- var group = groups.get(0);
-
- var bundleCrit = new BundleCriteria;
- bundleCrit.addFilterName(bundleName);
- var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
-
- if (bundles.empty) {
- throw "No bundle called '" + bundleName + "' found.";
- }
-
- var bundle = bundles.get(0);
-
- return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
-}
-
-/**
- * Tries to deploy given bundle version to provided destination using given configuration.
- * <p>
- * This method blocks while waiting for the deployment to complete or fail.
- *
- * @param destination the bundle destination (or id thereof)
- * @param bundleVersion the bundle version to deploy (or id thereof)
- * @param deploymentConfiguration the deployment configuration. This can be an ordinary
- * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
- * it is converted to a Configuration instance using the <code>asConfiguration</code>
- * function from <code>util.js</code>. Please consult the documentation of that method
- * to understand the limitations of that approach.
- * @param description the deployment description
- * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
- * perform as an upgrade to the existing deployment, if any
- *
- * @return the BundleDeployment instance describing the deployment
- */
-function deployBundle(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
- var destinationId = destination;
- if (typeof(destination) == 'object') {
- destinationId = destination.id;
- }
-
- var bundleVersionId = bundleVersion;
- if (typeof(bundleVersion) == 'object') {
- bundleVersionId = bundleVersion.id;
- }
-
- var deploymentConfig = deploymentConfiguration;
- if (!(deploymentConfiguration instanceof Configuration)) {
- deploymentConfig = asConfiguration(deploymentConfiguration);
- }
-
- var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
-
- deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
-
- var crit = new BundleDeploymentCriteria;
- crit.addFilterId(deployment.id);
-
- while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
- java.lang.Thread.currentThread().sleep(1000);
- var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
- if (dps.empty) {
- throw "The deployment disappeared while we were waiting for it to complete.";
- }
-
- deployment = dps.get(0);
- }
-
- return deployment;
-}
-
-//------------------- script body
+//-------------------------- script body
-deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
+var bundles = require('rhq://downloads/bundles');
+bundles.deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
commit 2c7d416a70e0172b7d8587479b7e5e44e4e14bdb
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Sep 26 11:09:55 2012 -0400
Add the new script-modules section as a downloadable-resource
diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/bundles.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/bundles.js
new file mode 100644
index 0000000..f7fbdc2
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/bundles.js
@@ -0,0 +1,150 @@
+/**
+ * file: bundles.js
+ *
+ * description: this file contains a few helper functions to make working
+ * with the bundle subsystem more convenient.
+ *
+ * Note that you must login before you can load the scripts.
+ *
+ * author: lkrejci(a)redhat.com
+ */
+
+var util = require('./util');
+
+/**
+ * A simple function to create a new bundle version from a zip file containing
+ * the bundle.
+ *
+ * @param pathToBundleZipFile the path to the bundle on the local file system
+ *
+ * @return an instance of BundleVersion class describing what's been created on
+ * the RHQ server.
+ */
+exports.createBundleVersion = function(pathToBundleZipFile) {
+ var bytes = getFileBytes(pathToBundleZipFile)
+ return BundleManager.createBundleVersionViaByteArray(bytes)
+}
+
+/**
+ * This is a helper function that one can use to find out what base directories
+ * given resource type defines.
+ * <p>
+ * These base directories then can be used when specifying bundle destinations.
+ *
+ * @param resourceTypeId
+ * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
+ */
+exports.getAllBaseDirectories = function(resourceTypeId) {
+ var crit = new ResourceTypeCriteria;
+ crit.addFilterId(resourceTypeId);
+ crit.fetchBundleConfiguration(true);
+
+ var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
+
+ if (types.size() == 0) {
+ throw "Could not find a resource type with id " + resourceTypeId;
+ } else if (types.size() > 1) {
+ throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
+ }
+
+ var type = types.get(0);
+
+ return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
+}
+
+/**
+ * Creates a new destination for given bundle. Once a destination exists,
+ * actual bundle versions can be deployed to it.
+ * <p>
+ * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
+ * method in the fact that one can provide bundle and resource group names instead of their
+ * ids.
+ *
+ * @param destinationName the name of the destination to be created
+ * @param description the description for the destination
+ * @param bundleName the name of the bundle to create the destination for
+ * @param groupName name of a group of resources that the destination will handle
+ * @param baseDirName the name of the basedir definition that represents where inside the
+ * deployment of the individual resources the bundle will get deployed
+ * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
+ *
+ * @return BundleDestination object
+ */
+exports.createBundleDestination = function(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
+ var groupCrit = new ResourceGroupCriteria;
+ groupCrit.addFilterName(groupName);
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
+
+ if (groups.empty) {
+ throw "No group called '" + groupName + "' found.";
+ }
+
+ var group = groups.get(0);
+
+ var bundleCrit = new BundleCriteria;
+ bundleCrit.addFilterName(bundleName);
+ var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
+
+ if (bundles.empty) {
+ throw "No bundle called '" + bundleName + "' found.";
+ }
+
+ var bundle = bundles.get(0);
+
+ return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
+}
+
+/**
+ * Tries to deploy given bundle version to provided destination using given configuration.
+ * <p>
+ * This method blocks while waiting for the deployment to complete or fail.
+ *
+ * @param destination the bundle destination (or id thereof)
+ * @param bundleVersion the bundle version to deploy (or id thereof)
+ * @param deploymentConfiguration the deployment configuration. This can be an ordinary
+ * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
+ * it is converted to a Configuration instance using the <code>asConfiguration</code>
+ * function from <code>util.js</code>. Please consult the documentation of that method
+ * to understand the limitations of that approach.
+ * @param description the deployment description
+ * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
+ * perform as an upgrade to the existing deployment, if any
+ *
+ * @return the BundleDeployment instance describing the deployment
+ */
+exports.deployBundle = function(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
+ var destinationId = destination;
+ if (typeof(destination) == 'object') {
+ destinationId = destination.id;
+ }
+
+ var bundleVersionId = bundleVersion;
+ if (typeof(bundleVersion) == 'object') {
+ bundleVersionId = bundleVersion.id;
+ }
+
+ var deploymentConfig = deploymentConfiguration;
+ if (!(deploymentConfiguration instanceof Configuration)) {
+ deploymentConfig = util.asConfiguration(deploymentConfiguration);
+ }
+
+ var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
+
+ deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
+
+ var crit = new BundleDeploymentCriteria;
+ crit.addFilterId(deployment.id);
+
+ while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
+ java.lang.Thread.currentThread().sleep(1000);
+ var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
+ if (dps.empty) {
+ throw "The deployment disappeared while we were waiting for it to complete.";
+ }
+
+ deployment = dps.get(0);
+ }
+
+ return deployment;
+}
+
diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/drift.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/drift.js
new file mode 100644
index 0000000..b07eaec
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/drift.js
@@ -0,0 +1,240 @@
+/**
+ * file: drift.js
+ *
+ * description: This script contains functions that illustrate and highlight
+ * drift monitoring functionality. Some of the functionality demonstrated in
+ * this script is currently available only via RHQ's remote client (and CLI)
+ * at the time of this writing.
+ *
+ * Note that you must login before you can load the scripts. Also please note
+ * that if a function is not documented, then it is not intended for public
+ * use. It is used only as an internal helper function.
+ *
+ * author: jsanda(a)redhat.com
+ */
+
+var util = require("./util");
+
+/**
+ * description: Generates a snapshot of changes sets belonging to a particular
+ * drift definition of a specific resource. By default all change sets are
+ * included in the snapshot. An optional third argument can be specified to
+ * limit or control the number of change sets included in the snapshot.
+ *
+ * Note that a snapshot is an accumulation or aggregation of change sets that
+ * provides a view of a resource, or more precisely, all files being monitored
+ * for drift, at a particular version or point in time.
+ *
+ * arguments:
+ * rid: A resource id, expected to be an integer
+ *
+ * defName: The drift definition name as a string
+ *
+ * filter: (optional) A map or JS object that limits the number of
+ * change sets included in the snapshot. It should specify two
+ * properties - startVersion and endVersion.
+ *
+ * return: A org.rhq.core.domamin.drift.DriftSnapshot object
+ *
+ * usage:
+ * // generates a snapshot that includes all change sets belonging to the
+ * // mydrift drift configuration.
+ * createSnapshot(123, 'mydrift')
+ *
+ * // generates a snapshot that includes change sets 3 through 5 inclusive.
+ * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5})
+ */
+exports.createSnapshot = function(rid, defName) {
+ var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) });
+ var snapshotRequest;
+
+ if (arguments.length > 2) {
+ var filters = arguments[2];
+ snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion);
+ } else {
+ snapshotRequest = DriftSnapshotRequest(driftDef.id);
+ }
+
+ return DriftManager.getSnapshot(snapshotRequest);
+}
+
+/** private helper function to find a drift definition by a filter */
+function findDriftDefinition(rid, filter) {
+ var criteria = ResourceCriteria();
+ criteria.addFilterId(rid);
+ criteria.fetchDriftDefinitions(true);
+
+ var resources = ResourceManager.findResourcesByCriteria(criteria);
+ var resource = resources.get(0);
+
+ return util.find(resource.driftDefinitions, function(config) {
+ return filter(DriftDefinition(config));
+ });
+}
+
+/**
+ * description: Generates a diff report that is printed to the console. By
+ * default this function generates a snapshot diff. The function expects two
+ * arguments which should be DriftSnapshot objects. A diff between those two
+ * snapshots is generated and printed to the console. A path can be specified
+ * as an optional third argument. If a path is a specified as a third argument,
+ * then a file diff will be performed using the file that matches the path in
+ * each change set. The format will be a unified diff.
+ *
+ * Note that the snapshots can be from the same or from different resources;
+ * however, if they are from different resources, it is assumed that the
+ * resources are of the same type.
+ *
+ * arguments:
+ * s1: A DriftSnapshot object
+ *
+ * s2: A DriftSnapshot object
+ *
+ * path: (optional) A string that specifies a path that exists in both s1 and
+ * s2.
+ *
+ * return: This function does not return a useful value. It may be an empty
+ * string or it could be null. Instead of returning its results, the function
+ * prints them to the CLI console. As such, this function is intended for
+ * use from the interactive CLI shell.
+ *
+ * usage:
+ * // Generates a snapshot diff report
+ * diff(s1, s2)
+ *
+ * // Generates a file diff report in the unified format
+ * diff(s1, s2, 'jboss_home/bin/run.conf')
+ */
+exports.diff = function(s1, s2) {
+ var theDiff = s1.diff(s2);
+
+ if (arguments.length > 2) {
+ var path = arguments[2];
+
+ if (theDiff.elementsInConflict.size() == 0) {
+ // If the snapshot diff reports no files in conflict, then there
+ // is no need to call the server to perform the file diff. We can
+ // instead return quickly.
+ println("There are no differences to report");
+ return "";
+ }
+
+ var pathFilter = function(entry) { return entry.path == path; };
+ var e1 = util.find(s1.driftInstances, pathFilter);
+ var e2 = util.find(s2.driftInstances, pathFilter);
+
+ var fileDiff = DriftManager.generateUnifiedDiff(e1, e2);
+ util.foreach(fileDiff.diff, println);
+ return "";
+ }
+
+ function printEntry(entry) {
+ println(entry.newDriftFile.hashId + '\t' + entry.path);
+ }
+
+ function report(header, elements) {
+ println(header + ':');
+ util.foreach(elements, printEntry);
+ println('\n');
+ }
+
+ report('elements in conflict', theDiff.elementsInConflict);
+ report('elements not in left', theDiff.elementsNotInLeft);
+ report('elements not in right', theDiff.elementsNotInRight);
+}
+
+/**
+ * description: Generates and returns the drift history for a file being
+ * monitored for drift. This function takes three arguments. The first two, the
+ * resource id drift configuration name, uniquely identify the drift
+ * configuration. The third argument specifies a path that is set up for
+ * monitoring by the drift configuration.
+ *
+ * arguments:
+ * rid: A resource id
+ *
+ * configName: A drift configuration name
+ *
+ * path: A path that is set up for drift monitoring by the drift
+ * configuration that is identified by the first two arguments. The path
+ * should be specified as relative to the base directory from which
+ * monitoring is done.
+ *
+ * return: A History object, which is a native JS object. This object contains
+ * a few methods for working with the file history:
+ *
+ * list: prints a short summary of all versions of the file
+ * view: returns the contents of a particular version of the file
+ * compare: compares two versions of the file and prints a unified diff
+ *
+ * usage:
+ * $ history = fetchHistory(123, 'mydrift', 'bin/run.conf')
+ * $ history.list() // prints a summary of all versions of 'bin/run.conf'
+ * $ history.view(1) // returns the full contents of version 1 of the file
+ * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2
+ */
+exports.fetchHistory = function(rid, driftDefName, path) {
+ function History() {
+ var entries = [];
+
+ function findDrift(version) {
+ return util.find(entries, function(drift) {
+ return drift.changeSet.version == version
+ });
+ }
+
+
+ var generate = function() {
+ entries = [];
+ var criteria = GenericDriftCriteria();
+ criteria.addFilterResourceIds([rid]);
+ criteria.fetchChangeSet(true);
+ criteria.addFilterPath(path);
+
+ var drifts = DriftManager.findDriftsByCriteria(criteria);
+ util.foreach(drifts, function(drift) {
+ if (drift.changeSet.driftDefinition.name == driftDefName &&
+ drift.path == path) {
+ entries.push(drift);
+ }
+ });
+
+ entries.sort(function(d1, d2) {
+ return d1.changeSet.version <= d2.changeSet.version
+ });
+ }
+
+ this.list = function() {
+ var format = java.text.DateFormat.getDateTimeInstance();
+ println(path + "\n-----------------------------------");
+ util.foreach(entries, function(drift) {
+ println(drift.changeSet.version + "\t" + format.format(drift.ctime));
+ });
+ }
+
+ this.view = function(version) {
+ var drift = findDrift(version);
+ if (drift == null) {
+ return "Could not find version " + version;
+ }
+ return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId));
+ }
+
+ this.compare = function(v1, v2) {
+ var d1 = findDrift(v1);
+ if (d1 == null) {
+ return "Could not find version " + v1;
+ }
+ var d2 = findDrift(v2);
+ if (d2 == null) {
+ return "Could not find version " + v2;
+ }
+ var fileDiff = DriftManager.generateUnifiedDiff(d1, d2);
+ util.foreach(fileDiff.diff, println);
+ }
+
+ generate();
+ }
+
+ return new History();
+}
diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/jbossas.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/jbossas.js
new file mode 100644
index 0000000..6369cc1
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/jbossas.js
@@ -0,0 +1,811 @@
+/**
+ * This module contains a variety of utility functions for working with JBoss AS in different versions.
+ *
+ * @author Lukas Krejci
+ */
+
+
+var util = require('./util');
+var bundles = require("./bundles");
+
+//init the version-specific objects. We'll be adding the functions to them further down below.
+exports.as7 = {}
+
+/**
+ * This creates a new destination in the JBoss AS (4,5,6,7) servers from the provided
+ * group and deploys the application provided by the bundle to it. Once the app is deployed,
+ * the servers in the group are sequentially stopped and started.
+ *
+ * @param bundleZipFile the path to the zip file with the application bundle
+ * @param deploymentConfiguration the deployment configuration required by the bundle.
+ * See the <code>deployBundle</code> in <code>bundles.js</code> to find out about
+ * supported formats.
+ * @param groupName the name of the compatible group of JBossAS servers to deploy the bundle to
+ * @param destinationName the name of the destination that will be created so that the bundle
+ * can be deployed to it
+ * @param destinationDescription the description of the destination
+ * @param baseDirName the name of the base directory for the deployment. Each resource type
+ * defines a list of deployment base directories which you can review using, for example,
+ * the <code>getAllBaseDirectories(resourceTypeId)</code> function from <code>bundles.js</code>.
+ * @param deployDir the name of the directory under the base dir in which the bundle will be
+ * deployed to.
+ *
+ * @return the BundleDeployment instance
+ */
+exports.createAppAndRestart = function(bundleZipFile, deploymentConfiguration, groupName, destinationName, destinationDescription, baseDirName, deployDir) {
+ var gcrit = new ResourceGroupCriteria;
+ gcrit.addFilterName(groupName);
+ gcrit.fetchResourceType(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(gcrit);
+ if (groups.empty) {
+ throw "Could not find a resource group called " + groupName;
+ } else if (groups.size() > 1) {
+ throw "There are more than 1 groups called " + groupName;
+ }
+
+ var group = groups.get(0);
+ var targetResourceType = group.resourceType;
+
+ var deployFn = function(restartFn) {
+
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var destination = BundleManager.createBundleDestination(bundleVersion.bundle.id, destinationName, destinationDescription, baseDirName, deployDir, group.id);
+
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * Deploys an updated bundle of an enterprise application to a destination that
+ * points to a group of JBoss AS(4,5,6,7) servers and then stops all the servers
+ * serially and then starts them up again sequentially.
+ *
+ * @param bundleZipFile
+ * the path to the bundle zip file with the application
+ * @param jbasDestination
+ * the bundle destination the bundle should be deployed to (or id
+ * thereof)
+ * @param deploymentConfiguration
+ * the deployment configuration. This can be an ordinary javascript
+ * object (hash) or an instance of RHQ's Configuration. If it is the
+ * former, it is converted to the Configuration instance using the
+ * <code>asConfiguration</code> function from <code>util.js</code>.
+ * Please consult the documentation of that method to understand the
+ * limitations of that approach.
+ * @param description
+ * the deployment description
+ *
+ * @return the deployment instance
+ */
+exports.updateAppAndRestart = function(bundleZipFile, jbasDestination, deploymentConfiguration) {
+ // first figure out the jbas version we are deploying to
+ var destinationId = jbasDestination;
+ if (typeof(jbasDestination) == 'object') {
+ destinationId = jbasDestination.id;
+ }
+
+ var destCrit = new BundleDestinationCriteria
+ destCrit.fetchGroup(true)
+
+ var destinations = BundleManager.findBundleDestinationsByCriteria(destCrit);
+
+ if (destinations.empty) {
+ throw "No destinations corresponding to " + jbasDestination + " found on the server.";
+ }
+
+ var destination = destinations.get(0);
+
+ var targetResourceType = destination.group.resourceType;
+
+ if (targetResourceType == null) {
+ throw "This function expects a compatible group of JBoss AS (4,5,6 or 7) resources but the provided destination is connected with " + destination.group;
+ }
+
+ var deployFn = function(restartFn) {
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(destination.group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * This function adds an AS7 server to a cluster with another AS7 instance, using
+ * the provided node name as its identifier.
+ * <p>
+ * This method only makes the new member use the same configuration as the existing
+ * member and synchronizes its jgroups, messaging and modcluster socket bindings
+ * with the cluster. Optionally it also copies over all the deployments to the
+ * new member.
+ * <p>
+ * The configurations are therefore assumed to be otherwise compatible - i.e.
+ * the infinispan cache containers should be configured correctly (or left at
+ * default values, which are configured correctly), etc.
+ *
+ * @param newAs7Resource the resource proxy of the AS7 instance to add
+ * @param newNodeName the node name, i.e. unique identification, of the new member
+ * in the cluster
+ * @param existingClusterMemberResource an AS7 instance that belongs to a cluster
+ * the new member should join into.
+ * @param copyDeployments whether or not to copy the deployments from the existing
+ * member to the new member
+ */
+exports.as7.addToCluster = function(newAs7Resource, newNodeName, existingClusterMemberResource, doCopyDeployments) {
+ println("Reading config of the existing cluster member");
+ var existingMember = {
+ 'id' : existingClusterMemberResource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(existingClusterMemberResource),
+ 'pluginConfiguration' : _getPluginConfiguration(existingClusterMemberResource)
+ };
+
+ var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource.children,
+ existingMember.pluginConfiguration, existingMember.resourceConfiguration);
+
+ println("Reading config of the new member");
+ var newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ var memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+
+ var memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+
+ if (memberConfig['config'] != clusterConfig['config']) {
+ println("The configurations of the servers differ.\n" +
+ "The new cluster member's configuration will be changed to match the configuration of the existing member.");
+
+ newAs7Resource.updatePluginConfiguration(_changeConfig(newMember.pluginConfiguration, clusterConfig['config']));
+
+ //we need to restart straight away so that we see the changes to the
+ //rest of the configuration caused by the change of current config.
+ println("Restarting the new cluster member to switch it to the new configuration.");
+ newAs7Resource.restart();
+
+ //refresh the resource
+ newAs7Resource = ProxyFactory.getResource(newMember.id);
+ newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ //refresh the cluster specific config after the restart with the new
+ //config
+ memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration;
+ }
+
+ //now check what's the node name we see
+ if (memberConfig['node-name'] != newNodeName) {
+ println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'");
+ _updateNodeName(memberResourceConfiguration, newNodeName);
+
+ newAs7Resource.updateResourceConfiguration(memberResourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+ }
+
+ //now apply the socket binding changes for jgroups and other cluster
+ //significant subsystems
+ //first find the socket binding group config in the new member
+ for(i in newAs7Resource.children) {
+ var child = newAs7Resource.children[i];
+ if (child.resourceType.name == 'SocketBindingGroup' &&
+ child.resourceType.plugin == 'JBossAS7') {
+
+ println("Updating socket bindings of jgroups, messaging and modcluster subsystems");
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ var portOffset = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var clusterMemberPortOffset = clusterConfig['port-offset'];
+
+ var newConfig = resourceConfig.deepCopy(false);
+
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']);
+
+ child.updateResourceConfiguration(newConfig);
+ }
+ }
+
+ println("Restarting the new member for the new socket bindings to take effect.");
+ newAs7Resource.restart();
+
+ if (doCopyDeployments) {
+ println("Copying the deployments to the new cluster member...");
+ copyDeployments(existingClusterMemberResource, newAs7Resource);
+
+ println("Restarting the new cluster member.");
+ newAs7Resource.restart();
+ }
+}
+
+/**
+ * Copies all deployments from the source to the target. Both resources must
+ * be standalone AS7 servers.
+ *
+ * @param sourceAS7 the resource id or object of the source AS7 standalone instance
+ * @param targetAS7 the resource id or object of the target AS7 standalone instance
+ */
+exports.as7.copyDeployments = function(sourceAS7, targetAS7) {
+ if (typeof sourceAS7 == 'object') {
+ sourceAS7 = sourceAS7.id;
+ }
+
+ if (typeof targetAS7 == 'object') {
+ targetAS7 = targetAS7.id;
+ }
+
+ var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'JBossAS7');
+
+ var deploymentsCrit = new ResourceCriteria;
+ deploymentsCrit.addFilterParentResourceId(sourceAS7);
+ deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id);
+
+ var unlimitedPageControl = PageControl.unlimitedInstance;
+
+ var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit);
+ var iterator = sourceDeployments.iterator();
+ while (iterator.hasNext()) {
+ var deploymentResource = iterator.next();
+ //get a resource proxy for easy access to configurations, etc.
+ deploymentResource = ProxyFactory.getResource(deploymentResource.id);
+
+ println("Copying deployment " + deploymentResource.name);
+
+ var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id);
+ var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id);
+
+ var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name);
+
+ var deploymentConfiguration = new Configuration;
+ deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName));
+
+ //so now we have both metadata and the data of the deployment, let's
+ //push a copy of it to the target server
+ var history = ResourceFactoryManager.createPackageBackedResource(targetAS7,
+ deploymentResourceType.id, deploymentResource.name,
+ deploymentResource.pluginConfiguration,
+ installedPackage.packageVersion.generalPackage.name,
+ installedPackage.packageVersion.version,
+ installedPackage.packageVersion.architecture.id,
+ deploymentConfiguration, content, null);
+
+ while (history.status.name() == 'IN_PROGRESS') {
+ java.lang.Thread.sleep(1000);
+ //the API for checking the create histories is kinda weird..
+ var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl);
+ var hit = histories.iterator();
+ var found = false;
+ while(hit.hasNext()) {
+ var h = hit.next();
+
+ if (h.id == history.id) {
+ history = h;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ throw "The history object for the deployment seems to have disappeared, this is very strange.";
+ }
+ }
+
+ println("Deployment finished with status: " + history.status.toString() +
+ (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + ".")));
+ }
+}
+
+function _getConfigName(as7PluginConfig) {
+ var argsValue = as7PluginConfig.getSimpleValue('startScriptArgs', '');
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var ret = null;
+ for (i in args) {
+ var arg = args[i];
+
+ var found = false;
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ ret = arg.substring(pos + param.length).trim();
+ found = true;
+ break;
+ }
+ }
+
+ if (found) {
+ break;
+ }
+ }
+
+ if (ret != null && ret.startsWith('%') && ret.endsWith('%')) {
+ var pluginConfRef = ret.substring(1, ret.length - 1);
+ ret = as7PluginConfig.getSimpleValue(pluginConfigRef, null);
+ }
+
+ return ret;
+}
+
+function _changeConfig(pluginConfig, configName) {
+ var argsValue = javascriptString(pluginConfig.getSimpleValue('startScriptArgs', ''));
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var updated = false;
+
+ for (i in args) {
+ var arg = args[i];
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ args[i] = param + configName;
+ updated = true;
+ break;
+ }
+ }
+
+ if (updated) {
+ break;
+ }
+ }
+
+ if (!updated) {
+ args.push("-c " + configName);
+ }
+
+ //join the config back together
+ for(i in args) {
+ if (i == 0) {
+ argsValue = args[i];
+ } else {
+ argsValue += "\n" + args[i];
+ }
+ }
+
+ pluginConfig.put(new PropertySimple('startScriptArgs', argsValue));
+
+ return pluginConfig;
+}
+
+/**
+ * The config properties of AS7 can have a form of ${propertyName:defaultvalue}.
+ * Because we can't figure out the value of the property if it is defined,
+ * (or get at its default value), we return the following hash from this function
+ * {
+ * property : propertyName,
+ * value : defaultvalue
+ * }
+ *
+ * At least one of the keys in the above hash will have a value.
+ */
+function _parseValueFromExpr(expr) {
+ var strExpr = expr + '';
+ if (strExpr.indexOf('${') == 0) {
+ var colonIdx = strExpr.indexOf(':');
+ if (colonIdx == -1) {
+ return { 'property' : expr };
+ } else {
+ var property = strExpr.substring(2, colonIdx);
+ var value = strExpr.substring(colonIdx + 1, strExpr.length - 1);
+
+ return { 'property' : property, 'value' : value };
+ }
+ } else {
+ return { 'value' : expr };
+ }
+}
+
+/**
+ * This converts the result of _parseValueFromExpr() function back into the
+ * ${property:defaultvalue} format.
+ */
+function _composeValueExpr(parsedValue) {
+ if (parsedValue.property == undefined) {
+ return parsedValue.value;
+ } else {
+ return '${' + parsedValue.property + ':' + parsedValue.value + '}';
+ }
+}
+
+function _updateNodeName(serverResourceConfiguration, newNodeName) {
+ //define it as a system prop
+ var systemProps = serverResourceConfiguration.getList('*2');
+ if (systemProps == null) {
+ systemProps = new PropertyList('*2');
+ serverResourceConfiguration.put(systemProps);
+ }
+
+ var it = systemProps.list.iterator();
+ var updated = false;
+ while (it.hasNext()) {
+ var systemProp = it.next();
+ var systemPropName = javascriptString(systemProp.getSimpleValue('name', null));
+ if (systemPropName == 'jboss.node.name') {
+ var systemPropValue = systemProp.getSimple('value');
+ if (systemPropValue == null) {
+ systemPropValue = new PropertySimple('value', newNodeName);
+ systemProp.put(systemPropValue);
+ } else {
+ systemPropValue.setValue(newNodeName);
+ }
+
+ updated = true;
+ break;
+ }
+ }
+
+ if (!updated) {
+ var systemProp = new PropertyMap('*:name');
+ systemProp.put(new PropertySimple('name', 'jboss.node.name'));
+ systemProp.put(new PropertySimple('value', newNodeName));
+ systemProps.add(systemProp);
+ }
+}
+
+function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) {
+ portOffset = _parseValueFromExpr(portOffset);
+ clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset);
+
+ var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0;
+ var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ?
+ clusterMemberPortOffset.value : 0;
+
+ var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue;
+
+ var ports = socketBindingsConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var appliedProperties = [];
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+
+ var name = port.getSimpleValue('name', null);
+
+ if (socketBindingConfig[name] != undefined) {
+ //k, this is a significant config, port it over
+
+ //compute the value of the ports
+ if (socketBindingConfig[name]['fixed-port'] == 'true') {
+ port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr']));
+ port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr']));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'true'));
+ } else {
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'false'));
+ }
+ appliedProperties.push(name);
+ }
+ }
+
+ //I need contains() and Rhino's Array object apparently doesn't have indexOf()
+ //which I could otherwise use.
+ appliedProperties = java.util.Arrays.asList(appliedProperties);
+
+ //now add to the list the props that were not there
+ for(name in socketBindingConfig) {
+ if (appliedProperties.contains(name)) {
+ continue;
+ }
+
+ var port = new PropertyMap('binding');
+ ports.add(port);
+
+ port.put(new PropertySimple('name', name));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port']));
+
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ }
+}
+
+
+/**
+ * Returns a javascript hash of configuration properties significant for the
+ * cluster configuration.
+ *
+ * This method is quite simplistic - it merely reads out the important socket
+ * bindings and Infinispan configuration properties.
+ *
+ * It doesn't try to be smart about specifying which concrete caches and cache
+ * containers are used for individual subsystems like EJB3, JPA or web apps.
+ *
+ * @param resource the resource proxy of the AS7
+ */
+function _getClusterSignificantConfig(children, pluginConfiguration, resourceConfiguration) {
+ var ret = {};
+
+ ret['config'] = javascriptString(_getConfigName(pluginConfiguration));
+
+ ret['node-name'] = javascriptString(resourceConfiguration.getSimpleValue('node-name', null));
+
+ //the standalone server has a single socket binding group
+ for(var i in children) {
+ var child = children[i];
+ if (child.resourceType.plugin != 'JBossAS7') {
+ continue;
+ }
+ if (child.resourceType.name == 'SocketBindingGroup') {
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ ret['port-offset'] = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var ports = resourceConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var jgroups = {};
+ var messaging = {};
+ var modcluster = {};
+
+ ret['jgroups'] = jgroups;
+ ret['messaging'] = messaging;
+ ret['modcluster'] = modcluster;
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+ var name = javascriptString(port.getSimpleValue('name', null));
+
+ if (name.indexOf('jgroups') == 0) {
+ jgroups[name] = _getSocketBinding(port);
+ } else if (name.indexOf('messaging') == 0) {
+ messaging[name] = _getSocketBinding(port);
+ } else if (name.indexOf('modcluster') == 0) {
+ modcluster[name] = _getSocketBinding(port);
+ }
+ }
+ } else if (child.resourceType.name == 'Infinispan') {
+ var ispn = {};
+ ret['infinispan'] = ispn;
+
+ //This has disappeared
+ //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value);
+ var cacheContainers = {};
+ ispn['cache-containers'] = cacheContainers;
+
+ for(cc in child.children) {
+ var cacheContainer = child.children[cc];
+
+ var caches = {};
+
+ var containerConfig = _getLiveResourceConfiguration(cacheContainer);
+
+ cacheContainers[cacheContainer.name] = {
+ 'default-cache' : javascriptString(containerConfig.getSimpleValue('default-cache', null)),
+ 'aliases' : _asArray(containerConfig.get('aliases')),
+ 'caches' : caches
+ };
+
+ for (c in cacheContainer.children) {
+ var cache = cacheContainer.children[c];
+
+ caches[cache.name] = {
+ '_flavor' : javascriptString(containerConfig.getSimpleValue('_flavor', null)),
+ 'batching' : javascriptString(containerConfig.getSimpleValue('batching', null)),
+ 'indexing' : javascriptString(containerConfig.getSimpleValue('indexing', null)),
+ 'mode' : javascriptString(containerConfig.getSimpleValue('mode', null))
+ };
+ }
+ }
+ }
+ }
+
+ return ret;
+}
+
+function _getSocketBinding(port) {
+ return {
+ 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')),
+ 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)),
+ 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)),
+ 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null))
+ };
+}
+
+function javascriptString(string) {
+ return string == null || string == undefined ? string : string + '';
+}
+
+function _asArray(propertyList) {
+ var ret = [];
+ if (propertyList == undefined || propertyList == null) {
+ return ret;
+ }
+
+ var it = propertyList.list.iterator();
+ while (it.hasNext()) {
+ var prop = it.next();
+
+ if (prop instanceof PropertySimple) {
+ ret.push(javascriptString(prop.stringValue));
+ }
+ }
+
+ return ret;
+}
+
+function _getPluginConfiguration(resource) {
+ if (typeof(resource) == 'number') {
+ resource = ProxyFactory.getResource(resource)
+ } else {
+ resource = ProxyFactory.getResource(resource.id)
+ }
+ return resource.pluginConfiguration
+}
+
+function _getLiveResourceConfiguration(resource) {
+ var id;
+ if (typeof(resource) == 'number') {
+ id = resource;
+ } else {
+ id = resource.id
+ }
+
+ return ConfigurationManager.getLiveResourceConfiguration(id, false)
+}
+
+function _loadGroupMembers(group) {
+ var crit = new ResourceGroupCriteria;
+ crit.addFilterId(group.id);
+ crit.fetchExplicitResources(true);
+ crit.fetchImplicitResources(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(crit)
+
+ if (groups.empty) {
+ throw "Could not find a previously loaded group on the server: " + group;
+ }
+
+ return groups.get(0);
+}
+
+function _allResourceIds(group) {
+ var list = [];
+
+ if (group.explicitResources != null) {
+ foreach(group.explicitResources, function(resource) {
+ list.push(resource.id);
+ });
+ }
+
+ return list;
+}
+
+function _runOperationSequentially(group, operationName, operationConfig) {
+ group = _loadGroupMembers(group);
+ var resourceIds = _allResourceIds(group);
+
+ var conf = operationConfig;
+ if (!(conf instanceof Configuration)) {
+ conf = asConfiguration(conf);
+ }
+
+ // by specifying the resource ids explicitly, we define the order in which
+ // the operations will be executed on individual resources (in sequence).
+ // if the resourceIds were null, the operations would be invoked all at once
+ // in no particular order.
+ var schedule = OperationManager.scheduleGroupOperation(group.id, resourceIds, false, operationName, conf, 0, 0, 0, 0, null);
+
+ // now we need to wait for all the individual operations on resources to
+ // complete
+ var crit = new GroupOperationHistoryCriteria;
+ crit.addFilterJobId(new JobId(schedule.jobName, schedule.jobGroup));
+
+ while (true) {
+ // XXX should this be configurable?
+ // we're waiting for an AS to start/shutdown which takes time..
+ // Let's check in 5s intervals.
+ // We're waiting at the start of this loop to also ensure that the server
+ // had time to issue the quartz job and persist the history entry.
+ java.lang.Thread.currentThread().sleep(5000);
+
+ var results = OperationManager.findGroupOperationHistoriesByCriteria(crit);
+
+ if (results.empty) {
+ throw "Could not find operation history for schedule " + schedule + ". This should not happen.";
+ }
+
+ var history = results.get(0);
+
+ if (history.status != OperationRequestStatus.INPROGRESS) {
+ return history;
+ }
+ }
+}
+
+function _restartAS4(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS5(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS7(group) {
+ var shutdownOp = group.resourceType.name == "JBossAS7-Standalone" ? "shutdown" : "server:stop";
+ var startOp = group.resourceType.name == "JBossAS7-Standalone" ? "start" : "server:start";
+
+ _runOperationSequentially(group, shutdownOp, new Configuration);
+ _runOperationSequentially(group, startOp, new Configuration);
+}
diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/util.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/util.js
new file mode 100644
index 0000000..b67eebc
--- /dev/null
+++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/script-modules/util.js
@@ -0,0 +1,280 @@
+/**
+ * file: util.js
+ *
+ * description: This script contains functions that provide core, low-level
+ * functionality such as iterating over a collection or searching a collection.
+ * This has no other script or library dependencies.
+ *
+ * author: jsanda(a)redhat.com
+ * author: lkrejci(a)redhat.com
+ *
+ * See also http://johnsanda.blogspot.com/search/label/javascript
+ */
+
+
+/**
+ * If obj is a JS array or a java.util.Collection, each element is passed to
+ * the callback function. If obj is a java.util.Map, each map entry is passed
+ * to the callback function as a key/value pair. If obj is none of the
+ * aforementioned types, it is treated as a generic object and each of its
+ * properties is passed to the callback function as a name/value pair.
+ */
+exports.foreach = function (obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ fn(obj[i]);
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ fn(iterator.next());
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator()
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ fn(entry.key, entry.value);
+ }
+ }
+ else { // assume we have a generic object
+ for (i in obj) {
+ fn(i, obj[i]);
+ }
+ }
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. The first match that is found is returned.
+ */
+exports.find = function(obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ if (fn(obj[i])) {
+ return obj[i]
+ }
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ var next = iterator.next();
+ if (fn(next)) {
+ return next;
+ }
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator();
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ if (fn(entry.key, entry.value)) {
+ return {key: entry.key, value: entry.value};
+ }
+ }
+ }
+ else {
+ for (i in obj) {
+ if (fn(i, obj[i])) {
+ return {key: i, value: obj[i]};
+ }
+ }
+ }
+ return null;
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. All of the matches are returned in a java.util.List.
+ */
+exports.findAll = function(obj, fn) {
+ var matches = java.util.ArrayList();
+ if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
+ foreach(obj, function(element) {
+ if (fn(element)) {
+ matches.add(element);
+ }
+ });
+ }
+ else {
+ foreach(obj, function(key, value) {
+ if (fn(theKey, theValue)) {
+ matches.add({key: theKey, value: theValue});
+ }
+ });
+ }
+ return matches;
+}
+
+/**
+ * A convenience function to convert javascript hashes into RHQ's configuration
+ * objects.
+ * <p>
+ * The conversion of individual keys in the hash follows these rules:
+ * <ol>
+ * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
+ * <li> if a value is a hash, it is interpreted as a PropertyMap
+ * <li> otherwise it is interpreted as a PropertySimple
+ * <li> a null or undefined value is ignored
+ * </ol>
+ * <p>
+ * Note that the conversion isn't perfect, because the hash does not contain enough
+ * information to restore the names of the list members.
+ * <p>
+ * Example: <br/>
+ * <pre><code>
+ * {
+ * simple : "value",
+ * list : [ "value1", "value2"],
+ * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
+ * }
+ * </code></pre>
+ * gets converted to a configuration object:
+ * Configuration:
+ * <ul>
+ * <li> PropertySimple(name = "simple", value = "value")
+ * <li> PropertyList(name = "list")
+ * <ol>
+ * <li>PropertySimple(name = "list", value = "value1")
+ * <li>PropertySimple(name = "list", value = "value2")
+ * </ol>
+ * <li> PropertyList(name = "listOfMaps")
+ * <ol>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value")
+ * <li>PropertySimple(name = "k2", value = "value")
+ * </ul>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value2")
+ * <li>PropertySimple(name = "k2", value = "value2")
+ * </ul>
+ * </ol>
+ * </ul>
+ * Notice that the members of the list have the same name as the list itself
+ * which generally is not the case.
+ */
+exports.asConfiguration = function(hash) {
+
+ config = new Configuration;
+
+ for(key in hash) {
+ value = hash[key];
+
+ if (value == null) {
+ continue;
+ }
+
+ (function(parent, key, value) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ function isPrimitive(obj) {
+ return typeof(obj) != 'object';
+ }
+
+ //this is an anonymous function, so the only way it can call itself
+ //is by getting its reference via argument.callee. Let's just assign
+ //a shorter name for it.
+ var me = arguments.callee;
+
+ var prop = null;
+
+ if (isPrimitive(value)) {
+ prop = new PropertySimple(key, new java.lang.String(value));
+ } else if (isArray(value)) {
+ prop = new PropertyList(key);
+ for(var i = 0; i < value.length; ++i) {
+ var v = value[i];
+ if (v != null) {
+ me(prop, key, v);
+ }
+ }
+ } else if (isHash(value)) {
+ prop = new PropertyMap(key);
+ for(var i in value) {
+ var v = value[i];
+ if (value != null) {
+ me(prop, i, v);
+ }
+ }
+ }
+
+ if (parent instanceof PropertyList) {
+ parent.add(prop);
+ } else {
+ parent.put(prop);
+ }
+ })(config, key, value);
+ }
+
+ return config;
+}
+
+/**
+ * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
+ * into a javascript hash.
+ *
+ * @param configuration
+ */
+exports.asHash = function(configuration) {
+ ret = {}
+
+ iterator = configuration.getMap().values().iterator();
+ while(iterator.hasNext()) {
+ prop = iterator.next();
+
+ (function(parent, prop) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ var me = arguments.callee;
+
+ var representation = null;
+
+ if (prop instanceof PropertySimple) {
+ representation = prop.stringValue;
+ } else if (prop instanceof PropertyList) {
+ representation = [];
+
+ for(var i = 0; i < prop.list.size(); ++i) {
+ var child = prop.list.get(i);
+ me(representation, child);
+ }
+ } else if (prop instanceof PropertyMap) {
+ representation = {};
+
+ var childIterator = prop.getMap().values().iterator();
+ while(childIterator.hasNext()) {
+ var child = childIterator.next();
+
+ me(representation, child);
+ }
+ }
+
+ if (isArray(parent)) {
+ parent.push(representation);
+ } else if (isHash(parent)) {
+ parent[prop.name] = representation;
+ }
+ })(ret, prop);
+ }
+ (function(parent) {
+
+ })(configuration);
+
+ return ret;
+}
\ No newline at end of file
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - 2 commits - modules/enterprise
by mazz
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a2d2fdb1da532a2b81619e5e645d066f5948360f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 10:03:43 2012 -0400
use constants
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
index a6fbc5b..27d4dfc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java
@@ -14,6 +14,7 @@ import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.core.domain.common.ServerDetails;
+import org.rhq.core.domain.common.composite.SystemSetting;
import org.rhq.core.domain.common.composite.SystemSettings;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
@@ -63,7 +64,8 @@ public class SystemInfoManagerBean implements SystemInfoManagerLocal{
// Don't use putAll(), as we need to filter out passwords
for (Map.Entry<String,String> detail : settingsMap.entrySet()) {
String key = detail.getKey();
- if (key.equals("CAM_LDAP_BIND_PW") || key.equals("CAM_HELP_PASSWORD")) {
+ if (key.equals(SystemSetting.LDAP_BIND_PW.getInternalName())
+ || key.equals(SystemSetting.HELP_PASSWORD.getInternalName())) {
if (detail.getValue()==null)
result.put(key,"- null -");
else
commit d056113808b211faaeafe2b55c7c38ba6c041309
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 10:03:36 2012 -0400
fix agent update servlet
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
index c4601ec..8069096 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java
@@ -188,7 +188,7 @@ public class AgentUpdateServlet extends HttpServlet {
// if the server cloud was configured to disallow updates, return 0
SystemSettings systemConfig = LookupUtil.getSystemManager().getSystemSettings(
LookupUtil.getSubjectManager().getOverlord());
- if (!Boolean.parseBoolean(systemConfig.get(SystemSetting.AGENT_AUTO_UPDATE_ENABLED.getInternalName()))) {
+ if (!Boolean.parseBoolean(systemConfig.get(SystemSetting.AGENT_AUTO_UPDATE_ENABLED))) {
return 0;
}
11 years, 7 months
- 1
- 0
[rhq] Branch 'spinder/plugin-dev' - 3 commits - modules/helpers
by Simeon Pinder
modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java | 243 +++++++++-
1 file changed, 234 insertions(+), 9 deletions(-)
New commits:
commit fd45f4b85d4786016b4fbaf560554ee5bc1545a5
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Mon Sep 24 18:41:01 2012 -0400
Add operation and update real time configuration display.
diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
index 2448438..973d9a5 100644
--- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
+++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
@@ -102,10 +102,12 @@ public class ManagedHive extends JFrame {
protected static ManagedHive CONTROLLER = null;
protected static Runnable angryTimer = null;
protected static int angryPackSize = 50;
+ protected static int beeAdditionAmount = 13;
protected static JLabel mood = null;
protected static JTextField swarmTimeDisplayField;
protected static JTextField populationBaseField;
protected static JTextField swarmTimeUpdateField;
+ protected static JTextField beeCountUpdateField;
protected static JButton updateConfiguration;
public enum Validation {
@@ -139,11 +141,9 @@ public class ManagedHive extends JFrame {
protected static Vector<Validation> validationList = new Vector<Validation>();
static {
- // for (Validation v : Validation.values()) {
- // validationList.add(v);
- // }
- validationList.add(Validation.POPULATION_BASE);
- validationList.add(Validation.SWARM_TIME);
+ for (Validation v : Validation.values()) {
+ validationList.add(v);
+ }
}
/** Responsible for putting together the layout components.
@@ -162,7 +162,7 @@ public class ManagedHive extends JFrame {
//monitor row
JPanel monitorRow = new JPanel();
monitorRow.setLayout(new BoxLayout(monitorRow, BoxLayout.X_AXIS));
- TitledBorder titledBorder1 = new TitledBorder("Current Values:");
+ TitledBorder titledBorder1 = new TitledBorder("Realtime Values:");
titledBorder1.setTitleColor(Color.gray);
monitorRow.setBorder(titledBorder1);
top.add(monitorRow);
@@ -170,9 +170,9 @@ public class ManagedHive extends JFrame {
//operation row
JPanel operationsRow = new JPanel();
operationsRow.setLayout(new BoxLayout(operationsRow, BoxLayout.X_AXIS));
- TitledBorder titledBorder2 = new TitledBorder("Operations:");
- titledBorder2.setTitleColor(Color.gray);
- operationsRow.setBorder(titledBorder2);
+ TitledBorder operationsBorder = new TitledBorder("Operations:");
+ operationsBorder.setTitleColor(Color.gray);
+ operationsRow.setBorder(operationsBorder);
top.add(operationsRow);
{
@@ -231,9 +231,29 @@ public class ManagedHive extends JFrame {
}
});
+ //add some more bees operation
+ JButton addNBees = new JButton("Add Bees");
+ addNBees.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ //retrieve addition amount
+ int addAmount = beeAdditionAmount;
+ for (int i = 0; i < addAmount; i++) {
+ addBee();
+ }
+ }
+ });
+
{//populate the operations row.
+ JTextField instructions = new JTextField(
+ "*Use these operations to modify the number of bees protecting the hive.*");
+ instructions.setEditable(false);
+ // operationsRow.add(Box.createHorizontalStrut(100));
+ operationsRow.add(instructions);
+ operationsRow.add(Box.createHorizontalStrut(space));
operationsRow.add(shake);
- operationsRow.add(Box.createHorizontalStrut(400));
+ monitorRow.add(Box.createHorizontalStrut(space));
+ operationsRow.add(addNBees);
}
//configuration row
@@ -262,7 +282,7 @@ public class ManagedHive extends JFrame {
configurationRow.add(populationBaseField);
//swarm time
- JLabel swarmTimeLabel = new JLabel("Swarm Time length");
+ JLabel swarmTimeLabel = new JLabel("Swarm Time(ms)");
configurationRow.add(swarmTimeLabel);
configurationRow.add(Box.createHorizontalStrut(space));
swarmTimeUpdateField = new JTextField("" + swarmTime);
@@ -277,6 +297,22 @@ public class ManagedHive extends JFrame {
}
configurationRow.add(swarmTimeUpdateField);
+ //add bee amount
+ JLabel beeAdditionAmountLabel = new JLabel("Bees to add");
+ configurationRow.add(beeAdditionAmountLabel);
+ configurationRow.add(Box.createHorizontalStrut(space));
+ beeCountUpdateField = new JTextField("" + beeAdditionAmount);
+ beeCountUpdateField.getDocument().addDocumentListener(new ConfigurationFieldsListener());
+ for (Validation v : validationList) {
+ if (v.compareTo(Validation.BEES_TO_ADD) == 0) {
+ //replace the component
+ int index = validationList.indexOf(v);
+ v.setField(beeCountUpdateField);
+ validationList.set(index, v);
+ }
+ }
+ configurationRow.add(beeCountUpdateField);
+
//update button
updateConfiguration = new JButton("Update configuration");
updateConfiguration.setEnabled(false);
@@ -302,7 +338,7 @@ public class ManagedHive extends JFrame {
swarmTime = newValue;
break;
case BEES_TO_ADD:
- basePopulation = newValue;
+ beeAdditionAmount = newValue;
break;
default:
break;
commit 24db3b26b523fc1f0a25ea1bb125b96c7c46b4e7
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Mon Sep 24 14:34:35 2012 -0400
adding better validation and more field display elements for configuration options.
diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
index 8291c77..2448438 100644
--- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
+++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
@@ -43,6 +43,9 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.border.LineBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
/** Is a basic ui that generates a very simple managed
* graphical resource that can be managed/monitored
@@ -100,7 +103,48 @@ public class ManagedHive extends JFrame {
protected static Runnable angryTimer = null;
protected static int angryPackSize = 50;
protected static JLabel mood = null;
- protected static JTextField swarmTimeField;
+ protected static JTextField swarmTimeDisplayField;
+ protected static JTextField populationBaseField;
+ protected static JTextField swarmTimeUpdateField;
+ protected static JButton updateConfiguration;
+
+ public enum Validation {
+ POPULATION_BASE(50, 2500), SWARM_TIME(30000, (60000 * 30)), BEES_TO_ADD(5, 150);
+ private int lowest;
+ private int highest;
+ private static JTextField field_value = null;
+
+ //
+ public int getLowest() {
+ return lowest;
+ }
+
+ public int getHighest() {
+ return highest;
+ }
+
+ public JTextField getField() {
+ return field_value;
+ }
+
+ public void setField(JTextField field) {
+ field_value = field;
+ }
+
+ private Validation(int lowest, int highest) {
+ this.lowest = lowest;
+ this.highest = highest;
+ }
+ };
+
+ protected static Vector<Validation> validationList = new Vector<Validation>();
+ static {
+ // for (Validation v : Validation.values()) {
+ // validationList.add(v);
+ // }
+ validationList.add(Validation.POPULATION_BASE);
+ validationList.add(Validation.SWARM_TIME);
+ }
/** Responsible for putting together the layout components.
*
@@ -118,12 +162,18 @@ public class ManagedHive extends JFrame {
//monitor row
JPanel monitorRow = new JPanel();
monitorRow.setLayout(new BoxLayout(monitorRow, BoxLayout.X_AXIS));
+ TitledBorder titledBorder1 = new TitledBorder("Current Values:");
+ titledBorder1.setTitleColor(Color.gray);
+ monitorRow.setBorder(titledBorder1);
top.add(monitorRow);
- //configuration/operation row
- JPanel interactionRow = new JPanel();
- interactionRow.setLayout(new BoxLayout(interactionRow, BoxLayout.X_AXIS));
- top.add(interactionRow);
+ //operation row
+ JPanel operationsRow = new JPanel();
+ operationsRow.setLayout(new BoxLayout(operationsRow, BoxLayout.X_AXIS));
+ TitledBorder titledBorder2 = new TitledBorder("Operations:");
+ titledBorder2.setTitleColor(Color.gray);
+ operationsRow.setBorder(titledBorder2);
+ top.add(operationsRow);
{
//monitor row shows current state of the hive
@@ -135,12 +185,12 @@ public class ManagedHive extends JFrame {
monitorRow.add(currentPopulation);
monitorRow.add(Box.createHorizontalStrut(space));
- JLabel maxPopulationLabel = new JLabel("Swarm Time(ms)");
+ JLabel maxPopulationLabel = new JLabel("Swarm Time Left(ms)");
monitorRow.add(maxPopulationLabel);
monitorRow.add(Box.createHorizontalStrut(space));
- swarmTimeField = new JTextField("" + swarmTime);
- swarmTimeField.setEditable(false);
- monitorRow.add(swarmTimeField);
+ swarmTimeDisplayField = new JTextField("" + swarmTime);
+ swarmTimeDisplayField.setEditable(false);
+ monitorRow.add(swarmTimeDisplayField);
monitorRow.add(Box.createHorizontalStrut(space));//spacer
mood = new JLabel();
@@ -180,7 +230,118 @@ public class ManagedHive extends JFrame {
}
}
});
- interactionRow.add(shake);
+
+ {//populate the operations row.
+ operationsRow.add(shake);
+ operationsRow.add(Box.createHorizontalStrut(400));
+ }
+
+ //configuration row
+ JPanel configurationRow = new JPanel();
+ configurationRow.setLayout(new BoxLayout(configurationRow, BoxLayout.X_AXIS));
+ TitledBorder configurationBorder = new TitledBorder("Configuration:");
+ configurationBorder.setTitleColor(Color.gray);
+ configurationRow.setBorder(configurationBorder);
+ top.add(configurationRow);
+
+ {//populate the configuration row.
+ //population base
+ JLabel basePopulationLabel = new JLabel("Base population");
+ configurationRow.add(basePopulationLabel);
+ configurationRow.add(Box.createHorizontalStrut(space));
+ populationBaseField = new JTextField("" + basePopulation);
+ populationBaseField.getDocument().addDocumentListener(new ConfigurationFieldsListener());
+ for (Validation v : validationList) {
+ if (v.compareTo(Validation.POPULATION_BASE) == 0) {
+ //replace the component
+ int index = validationList.indexOf(v);
+ v.setField(populationBaseField);
+ validationList.set(index, v);
+ }
+ }
+ configurationRow.add(populationBaseField);
+
+ //swarm time
+ JLabel swarmTimeLabel = new JLabel("Swarm Time length");
+ configurationRow.add(swarmTimeLabel);
+ configurationRow.add(Box.createHorizontalStrut(space));
+ swarmTimeUpdateField = new JTextField("" + swarmTime);
+ swarmTimeUpdateField.getDocument().addDocumentListener(new ConfigurationFieldsListener());
+ for (Validation v : validationList) {
+ if (v.compareTo(Validation.SWARM_TIME) == 0) {
+ //replace the component
+ int index = validationList.indexOf(v);
+ v.setField(swarmTimeUpdateField);
+ validationList.set(index, v);
+ }
+ }
+ configurationRow.add(swarmTimeUpdateField);
+
+ //update button
+ updateConfiguration = new JButton("Update configuration");
+ updateConfiguration.setEnabled(false);
+ updateConfiguration.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ //validate defaults and apply updates if possible.
+ for (Validation rule : validationList) {
+ JTextField field = rule.getField();
+ if (rule.getField() == null)
+ return;//bail if field not set
+ String newValueString = field.getText();
+ int newValue = -1;
+ try {
+ newValue = Integer.valueOf(newValueString);
+ //apply rules
+ if ((newValue >= rule.getLowest()) && (newValue <= rule.getHighest())) {
+ switch (rule) {
+ case POPULATION_BASE:
+ basePopulation = newValue;
+ break;
+ case SWARM_TIME:
+ swarmTime = newValue;
+ break;
+ case BEES_TO_ADD:
+ basePopulation = newValue;
+ break;
+ default:
+ break;
+ }
+ }
+ } catch (NumberFormatException nfe) {
+ String message = "";
+ switch (rule) {
+ case POPULATION_BASE:
+ message += "Population Base values must be >= '" + rule.getLowest() + "' and <= '"
+ + rule.getHighest() + "'.";
+ break;
+ case SWARM_TIME:
+ message += "Swarm Time values must be >= '" + rule.getLowest() + "' and <= '"
+ + rule.getHighest() + "'.";
+ break;
+ case BEES_TO_ADD:
+ message += "Number of bees to add must be >= '" + rule.getLowest() + "' and <= '"
+ + rule.getHighest() + "'.";
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported validation type: " + rule + " "
+ + nfe.getMessage());
+ }
+ }
+ }
+ //kick off population adjustments if any
+ ManagedHive.hiveComponent.removeBee();
+ //disable the update configuration button.
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ updateConfiguration.setEnabled(false);
+ }
+ });
+ }
+ });
+ configurationRow.add(updateConfiguration);
+ }
// center
JPanel center = new JPanel();
@@ -271,9 +432,9 @@ class Hive extends JComponent {
public void run() {
ManagedHive.currentPopulation.setText(ManagedHive.hiveComponent.getCurrentPopulation() + "");
if (ManagedHive.angryTimer != null) {
- ManagedHive.swarmTimeField.setText(((SwarmTimer) ManagedHive.angryTimer).getExpireTime() + "");
+ ManagedHive.swarmTimeDisplayField.setText(((SwarmTimer) ManagedHive.angryTimer).getExpireTime() + "");
} else {
- ManagedHive.swarmTimeField.setText("0");
+ ManagedHive.swarmTimeDisplayField.setText("0");
}
}
});
@@ -438,6 +599,7 @@ class SwarmTimer implements Runnable {
public void setExpireTime(int swarmTime) {
//only accept swarm times less than 10 mins and greater then 1 min(s).
+ //todo: spinder 9/24/12 relace this check with Validation.* checks
if ((swarmTime >= 1000 * 60) || (swarmTime <= 1000 * 60 * 10)) {
timeToLive = swarmTime;
}//otherwise ignore.
@@ -447,3 +609,20 @@ class SwarmTimer implements Runnable {
return timeToLive;
}
}
+
+class ConfigurationFieldsListener implements DocumentListener {
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ ManagedHive.updateConfiguration.setEnabled(true);
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ ManagedHive.updateConfiguration.setEnabled(true);
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ ManagedHive.updateConfiguration.setEnabled(true);
+ }
+}
commit b26f23023f63984a50fd91c3c9d446fecf46ce26
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Mon Sep 24 08:43:04 2012 -0400
update ui to reflect swarm time changes.
diff --git a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
index 141538f..8291c77 100644
--- a/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
+++ b/modules/helpers/pluginGen/src/main/java/org/rhq/helpers/ui/ManagedHive.java
@@ -100,6 +100,7 @@ public class ManagedHive extends JFrame {
protected static Runnable angryTimer = null;
protected static int angryPackSize = 50;
protected static JLabel mood = null;
+ protected static JTextField swarmTimeField;
/** Responsible for putting together the layout components.
*
@@ -137,9 +138,9 @@ public class ManagedHive extends JFrame {
JLabel maxPopulationLabel = new JLabel("Swarm Time(ms)");
monitorRow.add(maxPopulationLabel);
monitorRow.add(Box.createHorizontalStrut(space));
- JTextField maxPopulation = new JTextField("" + swarmTime);
- maxPopulation.setEditable(false);
- monitorRow.add(maxPopulation);
+ swarmTimeField = new JTextField("" + swarmTime);
+ swarmTimeField.setEditable(false);
+ monitorRow.add(swarmTimeField);
monitorRow.add(Box.createHorizontalStrut(space));//spacer
mood = new JLabel();
@@ -269,6 +270,11 @@ class Hive extends JComponent {
@Override
public void run() {
ManagedHive.currentPopulation.setText(ManagedHive.hiveComponent.getCurrentPopulation() + "");
+ if (ManagedHive.angryTimer != null) {
+ ManagedHive.swarmTimeField.setText(((SwarmTimer) ManagedHive.angryTimer).getExpireTime() + "");
+ } else {
+ ManagedHive.swarmTimeField.setText("0");
+ }
}
});
}
@@ -436,4 +442,8 @@ class SwarmTimer implements Runnable {
timeToLive = swarmTime;
}//otherwise ignore.
}
+
+ public static int getExpireTime() {
+ return timeToLive;
+ }
}
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 249 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java | 20
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java | 5
modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml | 49 -
modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties | 42 +
5 files changed, 176 insertions(+), 189 deletions(-)
New commits:
commit 9169bda4907fa0a891a261d7792cee35ebd9473b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 09:07:09 2012 -0400
in order to workaround https://issues.jboss.org/browse/AS7-5342 we are no longer supporting
Properties as directly settable via our sar descriptor. Instead, the properties are
in a .properties file now and our MBean will read in the properties and set the overrides that way.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index a332113..1479a56 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -85,6 +85,8 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
*/
private static Logger LOG = ServerI18NFactory.getLogger(ServerCommunicationsService.class);
+ private static final String DEFAULT_OVERRIDES_PROPERTIES_FILE = "server-comm-configuration-overrides.properties";
+
/**
* The remoting subsystem name that identifies remote API client messages.
*/
@@ -113,6 +115,11 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
private String m_configFile = ServerConfigurationConstants.DEFAULT_SERVER_CONFIGURATION_FILE;
/**
+ * The location of the configuration overrides properties file - can be a URL, file path or path within classloader.
+ */
+ private String m_overridesFile = DEFAULT_OVERRIDES_PROPERTIES_FILE;
+
+ /**
* The preferences node name that identifies the configuration set used to configure the services.
*/
private String m_preferencesNodeName = ServerConfigurationConstants.DEFAULT_PREFERENCE_NODE;
@@ -269,6 +276,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
m_container = null;
m_configuration = null;
m_configFile = ServerConfigurationConstants.DEFAULT_SERVER_CONFIGURATION_FILE;
+ m_overridesFile = DEFAULT_OVERRIDES_PROPERTIES_FILE;
m_preferencesNodeName = ServerConfigurationConstants.DEFAULT_PREFERENCE_NODE;
m_configurationOverrides = new Properties();
m_knownAgents.removeAllAgents();
@@ -278,16 +286,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return;
}
- /*
- * @see ServerCommunicationsServiceMBean#getConfigurationFile()
- */
+ @Override
public String getConfigurationFile() {
return m_configFile;
}
- /*
- * @see ServerCommunicationsServiceMBean#setConfigurationFile(String)
- */
+ @Override
public void setConfigurationFile(String location) {
if (location == null) {
return;
@@ -295,67 +299,72 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
m_configFile = StringPropertyReplacer.replaceProperties(location);
}
- /*
- * @see ServerCommunicationsServiceMBean#getPreferencesNodeName()
- */
+ @Override
public String getPreferencesNodeName() {
return m_preferencesNodeName;
}
- /*
- * @see ServerCommunicationsServiceMBean#setPreferencesNodeName(String)
- */
+ @Override
public void setPreferencesNodeName(String node) {
m_preferencesNodeName = node;
}
- /*
- * @see ServerCommunicationsServiceMBean#getConfigurationOverrides()
- */
- public Properties getConfigurationOverrides() {
- return m_configurationOverrides;
+ @Override
+ public String getConfigurationOverridesFile() {
+ return m_overridesFile;
}
- /*
- * @see ServerCommunicationsServiceMBean#setConfigurationOverrides(Properties)
- */
- public void setConfigurationOverrides(Properties overrides) {
- if (overrides == null) {
- return;
+ @Override
+ public void setConfigurationOverridesFile(String location) {
+ if (location == null) {
+ m_overridesFile = null;
+ } else {
+ // substitute ${} replacement variables found in the location string
+ m_overridesFile = StringPropertyReplacer.replaceProperties(location);
}
- m_configurationOverrides.putAll(overrides);
}
- /*
- * @see ServerCommunicationsServiceMBean#setConfigurationOverrides2(Properties)
- */
- // for why we need to split our overrides into two attributes - see https://issues.jboss.org/browse/AS7-5342
- public void setConfigurationOverrides2(Properties overrides) {
+ private void loadConfigurationOverridesFromFile() throws Exception {
+ if (m_overridesFile == null) {
+ return; // nothing to do
+ }
+
+ InputStream is = getFileInputStream(m_overridesFile);
+ try {
+ Properties props = new Properties();
+ props.load(is);
+ setConfigurationOverrides(props);
+ } finally {
+ is.close(); // if we got here, "is" will never be null
+ }
+
+ return;
+ }
+
+ private Properties getConfigurationOverrides() {
+ return m_configurationOverrides;
+ }
+
+ private void setConfigurationOverrides(Properties overrides) {
if (overrides == null) {
return;
}
m_configurationOverrides.putAll(overrides);
}
- /*
- * @see ServerCommunicationsServiceMBean#reloadConfiguration()
- */
+ @Override
public ServerConfiguration reloadConfiguration() throws Exception {
getPreferencesNode().clear();
return prepareConfigurationPreferences();
}
- /*
- * @see ServerCommunicationsServiceMBean#getConfiguration()
- */
+ @Override
public ServerConfiguration getConfiguration() {
return m_configuration;
}
- /*
- * @see ServerCommunicationsServiceMBean#safeGetServiceContainer()
- */
+ @Override
public synchronized ServiceContainer safeGetServiceContainer() {
if (null == m_container) {
m_container = new ServiceContainer();
@@ -364,16 +373,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return m_container;
}
- /*
- * @see ServerCommunicationsServiceMBean#getServiceContainer()
- */
+ @Override
public ServiceContainer getServiceContainer() {
return m_container;
}
- /*
- * @see ServerCommunicationsServiceMBean#getStartedServerEndpoint()
- */
+ @Override
public String getStartedServerEndpoint() {
if (m_container == null) {
return null;
@@ -382,9 +387,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return m_container.getServerEndpoint();
}
- /*
- * @see ServerCommunicationsServiceMBean#getKnownAgentClient(org.jboss.on.domain.resource.Agent)
- */
+ @Override
public AgentClient getKnownAgentClient(Agent agent) {
AgentClient agent_client;
@@ -425,9 +428,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return agent_client;
}
- /*
- * @see ServerCommunicationsServiceMBean#destroyKnownAgentClient(Agent)
- */
+ @Override
public void destroyKnownAgentClient(Agent agent) {
AgentClient agent_client;
@@ -464,16 +465,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return;
}
- /*
- * @see ServerCommunicationsServiceMBean#getAllKnownAgents()
- */
+ @Override
public List<InvokerLocator> getAllKnownAgents() {
return m_knownAgents.getAllAgents();
}
- /*
- * @see ServerCommunicationsServiceMBean#addStartedAgent(Agent)
- */
+ @Override
public void addStartedAgent(Agent agent) {
String endpoint = agent.getRemoteEndpoint();
@@ -488,9 +485,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return;
}
- /*
- * @see ServerCommunicationsServiceMBean#removeDownedAgent(String)
- */
+ @Override
public void removeDownedAgent(String endpoint) {
m_knownAgents.removeAgent(endpoint);
@@ -517,9 +512,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return;
}
- /*
- * @see ServerCommunicationsServiceMBean#pingEndpoint(java.lang.String)
- */
+ @Override
public boolean pingEndpoint(String endpoint, long timeoutMillis) {
ClientCommandSender sender = null;
boolean pinged = false;
@@ -555,10 +548,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return pinged;
}
+ @Override
public Integer getGlobalConcurrencyLimit() {
return getServiceContainer().getConfiguration().getGlobalConcurrencyLimit();
}
+ @Override
public void setGlobalConcurrencyLimit(Integer maxConcurrency) {
if (maxConcurrency == null) {
maxConcurrency = Integer.valueOf(-1);
@@ -571,70 +566,85 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
ServiceContainerConfigurationConstants.GLOBAL_CONCURRENCY_LIMIT, maxConcurrency);
}
+ @Override
public Integer getInventoryReportConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
DiscoveryServerService.CONCURRENCY_LIMIT_INVENTORY_REPORT);
}
+ @Override
public void setInventoryReportConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(DiscoveryServerService.CONCURRENCY_LIMIT_INVENTORY_REPORT, maxConcurrency, true);
}
+ @Override
public Integer getAvailabilityReportConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
DiscoveryServerService.CONCURRENCY_LIMIT_AVAILABILITY_REPORT);
}
+ @Override
public void setAvailabilityReportConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(DiscoveryServerService.CONCURRENCY_LIMIT_AVAILABILITY_REPORT, maxConcurrency, true);
}
+ @Override
public Integer getInventorySyncConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
DiscoveryServerService.CONCURRENCY_LIMIT_INVENTORY_SYNC);
}
+ @Override
public void setInventorySyncConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(DiscoveryServerService.CONCURRENCY_LIMIT_INVENTORY_SYNC, maxConcurrency, true);
}
+ @Override
public Integer getContentReportConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
ContentServerService.CONCURRENCY_LIMIT_CONTENT_REPORT);
}
+ @Override
public void setContentReportConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(ContentServerService.CONCURRENCY_LIMIT_CONTENT_REPORT, maxConcurrency, true);
}
+ @Override
public Integer getContentDownloadConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
ContentServerService.CONCURRENCY_LIMIT_CONTENT_DOWNLOAD);
}
+ @Override
public void setContentDownloadConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(ContentServerService.CONCURRENCY_LIMIT_CONTENT_DOWNLOAD, maxConcurrency, true);
}
+ @Override
public Integer getMeasurementReportConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
MeasurementServerService.CONCURRENCY_LIMIT_MEASUREMENT_REPORT);
}
+ @Override
public void setMeasurementReportConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(MeasurementServerService.CONCURRENCY_LIMIT_MEASUREMENT_REPORT, maxConcurrency, true);
}
+ @Override
public Integer getMeasurementScheduleRequestConcurrencyLimit() {
return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
MeasurementServerService.CONCURRENCY_LIMIT_MEASUREMENT_SCHEDULE_REQUEST);
}
+ @Override
public void setMeasurementScheduleRequestConcurrencyLimit(Integer maxConcurrency) {
setConcurrencyLimit(MeasurementServerService.CONCURRENCY_LIMIT_MEASUREMENT_SCHEDULE_REQUEST, maxConcurrency,
true);
}
+ @Override
public Boolean getMaintenanceModeAtStartup() {
InputStream inputStream = null;
Boolean flag;
@@ -659,10 +669,12 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return flag;
}
+ @Override
public Boolean isMaintenanceModeAtStartup() {
return getMaintenanceModeAtStartup();
}
+ @Override
public void setMaintenanceModeAtStartup(Boolean flag) {
if (flag == null) {
flag = Boolean.FALSE;
@@ -672,58 +684,42 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
return;
}
- /*
- * @see ServiceContainerMetricsMBean#clear()
- */
+ @Override
public void clear() {
getServiceContainerMetricsMBean().clear();
}
- /*
- * @see ServiceContainerMetricsMBean#getNumberDroppedCommandsReceived()
- */
+ @Override
public long getNumberDroppedCommandsReceived() {
return getServiceContainerMetricsMBean().getNumberDroppedCommandsReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getNumberNotProcessedCommandsReceived()
- */
+ @Override
public long getNumberNotProcessedCommandsReceived() {
return getServiceContainerMetricsMBean().getNumberNotProcessedCommandsReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getNumberFailedCommandsReceived()
- */
+ @Override
public long getNumberFailedCommandsReceived() {
return getServiceContainerMetricsMBean().getNumberFailedCommandsReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getNumberSuccessfulCommandsReceived()
- */
+ @Override
public long getNumberSuccessfulCommandsReceived() {
return getServiceContainerMetricsMBean().getNumberSuccessfulCommandsReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getNumberTotalCommandsReceived()
- */
+ @Override
public long getNumberTotalCommandsReceived() {
return getServiceContainerMetricsMBean().getNumberTotalCommandsReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getAverageExecutionTimeReceived()
- */
+ @Override
public long getAverageExecutionTimeReceived() {
return getServiceContainerMetricsMBean().getAverageExecutionTimeReceived();
}
- /*
- * @see ServiceContainerMetricsMBean#getCallTimeDataReceived()
- */
+ @Override
public Map<String, Calltime> getCallTimeDataReceived() {
return getServiceContainerMetricsMBean().getCallTimeDataReceived();
}
@@ -802,6 +798,7 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
}
// now that the configuration preferences are loaded, we need to override them with any bootstrap override properties
+ loadConfigurationOverridesFromFile();
Properties overrides = getConfigurationOverrides();
if (overrides != null) {
for (Map.Entry<Object, Object> entry : overrides.entrySet()) {
@@ -873,41 +870,11 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
private ServerConfiguration loadConfigurationFile() throws Exception {
String file_name = getConfigurationFile();
String preferences_node_name = getPreferencesNodeName();
- InputStream config_file_input_stream = null;
LOG.debug(ServerI18NResourceKeys.PREFERENCES_NODE_NAME, preferences_node_name);
LOG.debug(ServerI18NResourceKeys.LOADING_CONFIG_FILE, file_name);
- // first see if the file was specified as a path on the local file system
- try {
- File config_file = new File(file_name);
-
- if (config_file.exists()) {
- config_file_input_stream = new FileInputStream(config_file);
- }
- } catch (Exception e) {
- // isn't really an error - this just isn't a file on the local file system
- }
-
- // see if the file was specified as a URL
- if (config_file_input_stream == null) {
- try {
- URL config_file = new URL(file_name);
-
- config_file_input_stream = config_file.openStream();
- } catch (Exception e) {
- // isn't really an error - this just isn't a URL
- }
- }
-
- // if neither a file path or URL, assume the config file can be found in the classloader
- if (config_file_input_stream == null) {
- config_file_input_stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(file_name);
- }
-
- if (config_file_input_stream == null) {
- throw new IOException(LOG.getMsgString(ServerI18NResourceKeys.CANNOT_FIND_CONFIG_FILE, file_name));
- }
+ InputStream config_file_input_stream = getFileInputStream(file_name);
// We need to clear out any previous configuration in case the current config file doesn't specify a preference
// that already exists in the preferences node. In this case, the configuration file wants to fall back on the
@@ -954,6 +921,48 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
}
/**
+ * Loads a file either from file system, from URL or from classloader. If file
+ * can't be found, exception is thrown.
+ * @param file_name the file whose input stream is to be returned
+ * @return input stream of the file - will never be null
+ * @throws IOException if the file input stream cannot be obtained
+ */
+ private InputStream getFileInputStream(String file_name) throws IOException {
+ // first see if the file was specified as a path on the local file system
+ InputStream config_file_input_stream = null;
+ try {
+ File config_file = new File(file_name);
+
+ if (config_file.exists()) {
+ config_file_input_stream = new FileInputStream(config_file);
+ }
+ } catch (Exception e) {
+ // isn't really an error - this just isn't a file on the local file system
+ }
+
+ // see if the file was specified as a URL
+ if (config_file_input_stream == null) {
+ try {
+ URL config_file = new URL(file_name);
+
+ config_file_input_stream = config_file.openStream();
+ } catch (Exception e) {
+ // isn't really an error - this just isn't a URL
+ }
+ }
+
+ // if neither a file path or URL, assume the config file can be found in the classloader
+ if (config_file_input_stream == null) {
+ config_file_input_stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(file_name);
+ }
+
+ if (config_file_input_stream == null) {
+ throw new IOException(LOG.getMsgString(ServerI18NResourceKeys.CANNOT_FIND_CONFIG_FILE, file_name));
+ }
+ return config_file_input_stream;
+ }
+
+ /**
* Returns the preferences for this server. The node returned is where all preferences are to be stored.
*
* @return the server preferences
@@ -1006,10 +1015,4 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
LOG.info(ServerI18NResourceKeys.NEW_CONCURRENCY_LIMIT, limitName, maxConcurrency);
}
-
- // for why we need this in RHQ - see https://issues.jboss.org/browse/AS7-5336
- static {
- java.beans.PropertyEditorManager.registerEditor(Properties.class,
- org.jboss.util.propertyeditor.PropertiesEditor.class);
- }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
index 430870d..9c8c993 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
@@ -19,7 +19,6 @@
package org.rhq.enterprise.server.core.comm;
import java.util.List;
-import java.util.Properties;
import javax.management.ObjectName;
@@ -80,24 +79,15 @@ public interface ServerCommunicationsServiceMBean extends ServiceContainerMetric
void setPreferencesNodeName(String node);
/**
- * Returns a set of properties that will override the configuration preferences. If this returns <code>null</code>,
- * then the configuration preferences takes effect as-is.
- *
- * @return configuration setting overrides (may be <code>null</code>)
- */
- Properties getConfigurationOverrides();
-
- /**
* This allows you to explicitly override configuration preferences found in the configuration file. If this isn't
- * set, then the settings specified by the configuration preferences file take effect as-is. These overrides can be
- * set in the bootstrap deployment file (and thus allow you to be able to use any app-server specific settings, like
- * <code>${jboss.server.data.dir}</code>, in the configuration preference values).
+ * set, then the settings specified by the configuration preferences file take effect as-is. If this is set,
+ * this file is a properties file whose values will override the config file prefs.
*
- * @param overrides configuration settings that override the configuration preferences (may be<code>null</code>)
+ * @param overrides configuration settings file that override the configuration preferences (may be<code>null</code>)
*/
- void setConfigurationOverrides(Properties overrides);
+ void setConfigurationOverridesFile(String overridesFile);
- void setConfigurationOverrides2(Properties overrides); // why this? see https://issues.jboss.org/browse/AS7-5342
+ String getConfigurationOverridesFile();
/**
* This will clear any and all current configuration preferences and then reload the
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
index 685a654..0a1c625 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
@@ -219,10 +219,11 @@ public class TestServerCommunicationsService implements TestServerCommunications
public void setConfigurationFile(String location) {
}
- public void setConfigurationOverrides(Properties overrides) {
+ public String getConfigurationOverridesFile() {
+ return null;
}
- public void setConfigurationOverrides2(Properties overrides) {
+ public void setConfigurationOverridesFile(String f) {
}
public void setPreferencesNodeName(String node) {
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
index 2ee7cdf..ebb267f 100644
--- 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
@@ -63,55 +63,6 @@ org.quartz.jobStore.lockHandler.class = ${rhq.server.quartz.lockHandler
<mbean code="org.rhq.enterprise.server.core.comm.ServerCommunicationsService"
name="rhq:service=ServerCommunications">
-
- <!-- see https://issues.jboss.org/browse/AS7-5342 for why we have two attributes instead of just one-->
- <attribute name="ConfigurationOverrides">
-# location of the plugin jars and other files agents can download directly from sever
-rhq.server.agent-files-directory=${jboss.home.dir}/standalone/deployments/rhq.ear/rhq-downloads
-# location where data files can be stored
-rhq.communications.data-directory=${jboss.server.data.dir}
-# global limit on number of concurrent incoming messages allowed
-rhq.communications.global-concurrency-limit=${rhq.communications.global-concurrency-limit:200}
-# Server's remote endpoint for agents to talk to
-rhq.communications.connector.transport=${rhq.communications.connector.transport:servlet}
-rhq.communications.connector.bind-address=${rhq.communications.connector.bind-address}
-rhq.communications.connector.bind-port=${rhq.communications.connector.bind-port:7080}
-rhq.communications.connector.transport-params=${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}
-# Multicast detector configuration for auto-discovery
-rhq.communications.multicast-detector.enabled=${rhq.communications.multicast-detector.enabled:false}
-rhq.communications.multicast-detector.multicast-address=${rhq.communications.multicast-detector.multicast-address:224.16.16.16}
-rhq.communications.multicast-detector.bind-address=${rhq.communications.multicast-detector.bind-address}
-rhq.communications.multicast-detector.port=${rhq.communications.multicast-detector.port:16162}
- </attribute>
-
- <attribute name="ConfigurationOverrides2">
-# Server-side SSL Security Configuration (for incoming messages from agents)
-rhq.communications.connector.security.secure-socket-protocol=${rhq.communications.connector.security.secure-socket-protocol:TLS}
-rhq.communications.connector.security.keystore.file=${rhq.communications.connector.security.keystore.file}
-rhq.communications.connector.security.keystore.algorithm=${rhq.communications.connector.security.keystore.algorithm:SunX509}
-rhq.communications.connector.security.keystore.type=${rhq.communications.connector.security.keystore.type:JKS}
-rhq.communications.connector.security.keystore.password=${rhq.communications.connector.security.keystore.password:rhqpwd}
-rhq.communications.connector.security.keystore.key-password=${rhq.communications.connector.security.keystore.key-password:rhqpwd}
-rhq.communications.connector.security.keystore.alias=${rhq.communications.connector.security.keystore.alias:rhq}
-rhq.communications.connector.security.truststore.file=${rhq.communications.connector.security.truststore.file}
-rhq.communications.connector.security.truststore.algorithm=${rhq.communications.connector.security.truststore.algorithm:SunX509}
-rhq.communications.connector.security.truststore.type=${rhq.communications.connector.security.truststore.type:JKS}
-rhq.communications.connector.security.truststore.password=${rhq.communications.connector.security.truststore.password}
-rhq.communications.connector.security.client-auth-mode=${rhq.communications.connector.security.client-auth-mode:none}
-# Client-side SSL Security Configuration (for outgoing messages to agents)
-rhq.server.client.security.secure-socket-protocol=${rhq.server.client.security.secure-socket-protocol:TLS}
-rhq.server.client.security.keystore.file=${rhq.server.client.security.keystore.file}
-rhq.server.client.security.keystore.algorithm=${rhq.server.client.security.keystore.algorithm:SunX509}
-rhq.server.client.security.keystore.type=${rhq.server.client.security.keystore.type:JKS}
-rhq.server.client.security.keystore.password=${rhq.server.client.security.keystore.password:rhqpwd}
-rhq.server.client.security.keystore.key-password=${rhq.server.client.security.keystore.key-password:rhqpwd}
-rhq.server.client.security.keystore.alias=${rhq.server.client.security.keystore.alias:rhq}
-rhq.server.client.security.truststore.file=${rhq.server.client.security.truststore.file}
-rhq.server.client.security.truststore.algorithm=${rhq.server.client.security.truststore.algorithm:SunX509}
-rhq.server.client.security.truststore.type=${rhq.server.client.security.truststore.type:JKS}
-rhq.server.client.security.truststore.password=${rhq.server.client.security.truststore.password}
-rhq.server.client.security.server-auth-mode-enabled=${rhq.server.client.security.server-auth-mode-enabled:false}
- </attribute>
</mbean>
<mbean code="org.rhq.enterprise.server.plugin.pc.ServerPluginService"
diff --git a/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties b/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties
new file mode 100644
index 0000000..7b9e7a0
--- /dev/null
+++ b/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties
@@ -0,0 +1,42 @@
+# location of the plugin jars and other files agents can download directly from sever
+rhq.server.agent-files-directory=${jboss.home.dir}/standalone/deployments/rhq.ear/rhq-downloads
+# location where data files can be stored
+rhq.communications.data-directory=${jboss.server.data.dir}
+# global limit on number of concurrent incoming messages allowed
+rhq.communications.global-concurrency-limit=${rhq.communications.global-concurrency-limit:200}
+# Server's remote endpoint for agents to talk to
+rhq.communications.connector.transport=${rhq.communications.connector.transport:servlet}
+rhq.communications.connector.bind-address=${rhq.communications.connector.bind-address}
+rhq.communications.connector.bind-port=${rhq.communications.connector.bind-port:7080}
+rhq.communications.connector.transport-params=${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}
+# Multicast detector configuration for auto-discovery
+rhq.communications.multicast-detector.enabled=${rhq.communications.multicast-detector.enabled:false}
+rhq.communications.multicast-detector.multicast-address=${rhq.communications.multicast-detector.multicast-address:224.16.16.16}
+rhq.communications.multicast-detector.bind-address=${rhq.communications.multicast-detector.bind-address}
+rhq.communications.multicast-detector.port=${rhq.communications.multicast-detector.port:16162}
+# Server-side SSL Security Configuration (for incoming messages from agents)
+rhq.communications.connector.security.secure-socket-protocol=${rhq.communications.connector.security.secure-socket-protocol:TLS}
+rhq.communications.connector.security.keystore.file=${rhq.communications.connector.security.keystore.file}
+rhq.communications.connector.security.keystore.algorithm=${rhq.communications.connector.security.keystore.algorithm:SunX509}
+rhq.communications.connector.security.keystore.type=${rhq.communications.connector.security.keystore.type:JKS}
+rhq.communications.connector.security.keystore.password=${rhq.communications.connector.security.keystore.password:rhqpwd}
+rhq.communications.connector.security.keystore.key-password=${rhq.communications.connector.security.keystore.key-password:rhqpwd}
+rhq.communications.connector.security.keystore.alias=${rhq.communications.connector.security.keystore.alias:rhq}
+rhq.communications.connector.security.truststore.file=${rhq.communications.connector.security.truststore.file}
+rhq.communications.connector.security.truststore.algorithm=${rhq.communications.connector.security.truststore.algorithm:SunX509}
+rhq.communications.connector.security.truststore.type=${rhq.communications.connector.security.truststore.type:JKS}
+rhq.communications.connector.security.truststore.password=${rhq.communications.connector.security.truststore.password}
+rhq.communications.connector.security.client-auth-mode=${rhq.communications.connector.security.client-auth-mode:none}
+# Client-side SSL Security Configuration (for outgoing messages to agents)
+rhq.server.client.security.secure-socket-protocol=${rhq.server.client.security.secure-socket-protocol:TLS}
+rhq.server.client.security.keystore.file=${rhq.server.client.security.keystore.file}
+rhq.server.client.security.keystore.algorithm=${rhq.server.client.security.keystore.algorithm:SunX509}
+rhq.server.client.security.keystore.type=${rhq.server.client.security.keystore.type:JKS}
+rhq.server.client.security.keystore.password=${rhq.server.client.security.keystore.password:rhqpwd}
+rhq.server.client.security.keystore.key-password=${rhq.server.client.security.keystore.key-password:rhqpwd}
+rhq.server.client.security.keystore.alias=${rhq.server.client.security.keystore.alias:rhq}
+rhq.server.client.security.truststore.file=${rhq.server.client.security.truststore.file}
+rhq.server.client.security.truststore.algorithm=${rhq.server.client.security.truststore.algorithm:SunX509}
+rhq.server.client.security.truststore.type=${rhq.server.client.security.truststore.type:JKS}
+rhq.server.client.security.truststore.password=${rhq.server.client.security.truststore.password}
+rhq.server.client.security.server-auth-mode-enabled=${rhq.server.client.security.server-auth-mode-enabled:false}
11 years, 7 months
- 1
- 0