modules/enterprise/server/ear/src/main/application/alert-email-template.txt | 23 --
modules/enterprise/server/jar/src/main/resources/alert-email-template.txt | 23 ++
modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt | 91
----------
modules/enterprise/server/jar/src/test/resources/single-line-rhql.txt | 91
++++++++++
4 files changed, 114 insertions(+), 114 deletions(-)
New commits:
commit e15c5d4bc6a6cce33f3f62ecb43f741ba869af49
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Sep 25 17:36:06 2012 -0400
move alert email template to the proper place where AS7 can find it for us
diff --git a/modules/enterprise/server/ear/src/main/application/alert-email-template.txt
b/modules/enterprise/server/ear/src/main/application/alert-email-template.txt
deleted file mode 100644
index a791933..0000000
--- a/modules/enterprise/server/ear/src/main/application/alert-email-template.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Subject: [ALERT] priority of [@@@PRIORITY@@@] for alert [@@@ALERT_NAME@@@] on resource
[@@@RESOURCE_NAME@@@]
-
-The resource @@@RESOURCE_NAME@@@ has generated the following alert:
-
-------------------------------------------
-
-Resource Name : @@@RESOURCE_NAME@@@
-Alert Name : @@@ALERT_NAME@@@
-Alert Severity : @@@PRIORITY@@@
-Alert Date/Time : @@@TIMESTAMP@@@
-Conditions: @@@CONDITIONS@@@
-
-------------------------------------------
-
-Resource Ancestry:
-
-@@@FULL_RESOURCE_HIERARCHY@@@
-
-------------------------------------------
-
-For additional details about this alert, go to @@@ALERT_URL@@@
-
-This message was delivered to you by RHQ.
diff --git a/modules/enterprise/server/jar/src/main/resources/alert-email-template.txt
b/modules/enterprise/server/jar/src/main/resources/alert-email-template.txt
new file mode 100644
index 0000000..5e8f9cf
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/resources/alert-email-template.txt
@@ -0,0 +1,23 @@
+Subject: [ALERT] priority of [@@@PRIORITY@@@] for alert [@@@ALERT_NAME@@@] on resource
[@@@RESOURCE_NAME@@@]
+
+The resource @@@RESOURCE_NAME@@@ has generated the following alert:
+
+------------------------------------------
+
+Resource Name : @@@RESOURCE_NAME@@@
+Alert Name : @@@ALERT_NAME@@@
+Alert Severity : @@@PRIORITY@@@
+Alert Date/Time : @@@TIMESTAMP@@@
+Conditions: @@@CONDITIONS@@@
+
+------------------------------------------
+
+Resource Ancestry:
+
+@@@FULL_RESOURCE_HIERARCHY@@@
+
+------------------------------------------
+
+For additional details about this alert, go to @@@ALERT_URL@@@
+
+This message was delivered to you by RHQ.
commit 2113ac846f9b1d60fb765a5c1bb8ae84a83ddbde
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Sep 25 17:35:49 2012 -0400
this looks like it should have been in the test resources - moving to correct spot
diff --git a/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
b/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
deleted file mode 100644
index 25746f8..0000000
--- a/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-
-# simple term, all operators
-context = value
-context == value
-context != value
-context !== value
-context = null
-context != null
-
-# simple term, all operators, quoted value
-context = 'quoted value'
-context == 'quoted value'
-context != 'quoted value'
-context !== 'quoted value'
-context = null
-context != null
-
-# parameterized term, all operators
-context[param] = value
-context[param] == value
-context[param] != value
-context[param] !== value
-context[param] = null
-context[param] != null
-
-# deeply nested parenthetical simple terms
-((context = value))
-(((context = value)))
-((((context = value))))
-(((((context = value)))))
-
-# simple parenthetical term, all operators
-(context = value)
-(context == value)
-(context != value)
-(context !== value)
-(context = null)
-(context != null)
-
-# parameterized parenthetical term, all operators
-(context[param] = value)
-(context[param] == value)
-(context[param] != value)
-(context[param] !== value)
-(context[param] = null)
-(context[param] != null)
-
-
-
-# single-pair parenthetical combinations
-# simple expression, '|' boolean operator (meaning 'or')
-context = value1 | context = value2
-(context = value1) | context = value2
-context = value1 | (context = value2)
-(context = value1) | (context = value2)
-
-
-# single-pair parenthetical combinations
-# simple expression, no boolean operator (implies 'and' semantics)
-context = value context = value
-(context = value) context = value
-context = value (context = value)
-(context = value) (context = value)
-
-
-
-# double-pair parenthetical combinations
-# simple expression, '|' boolean operator (meaning 'or')
-((context = value1 | context = value2))
-((context = value1) | context = value2)
-((context = value1)) | context = value2
-(context = value1) | (context = value2)
-(context = value1 | (context = value2))
-context = value1 | ((context = value2))
-
-# double-pair parenthetical combinations
-# simple expression, no boolean operator (implies 'and' semantics)
-((context = value1 context = value2))
-((context = value1) context = value2)
-((context = value1)) context = value2
-(context = value1) (context = value2)
-(context = value1 (context = value2))
-context = value1 ((context = value2))
-
-# simple terms
-hello
-hello world
-"hello world" 'foo bar'
-'hello world' "foo bar"
-hello | world
-context=value | world
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/single-line-rhql.txt
b/modules/enterprise/server/jar/src/test/resources/single-line-rhql.txt
new file mode 100644
index 0000000..25746f8
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/resources/single-line-rhql.txt
@@ -0,0 +1,91 @@
+
+# simple term, all operators
+context = value
+context == value
+context != value
+context !== value
+context = null
+context != null
+
+# simple term, all operators, quoted value
+context = 'quoted value'
+context == 'quoted value'
+context != 'quoted value'
+context !== 'quoted value'
+context = null
+context != null
+
+# parameterized term, all operators
+context[param] = value
+context[param] == value
+context[param] != value
+context[param] !== value
+context[param] = null
+context[param] != null
+
+# deeply nested parenthetical simple terms
+((context = value))
+(((context = value)))
+((((context = value))))
+(((((context = value)))))
+
+# simple parenthetical term, all operators
+(context = value)
+(context == value)
+(context != value)
+(context !== value)
+(context = null)
+(context != null)
+
+# parameterized parenthetical term, all operators
+(context[param] = value)
+(context[param] == value)
+(context[param] != value)
+(context[param] !== value)
+(context[param] = null)
+(context[param] != null)
+
+
+
+# single-pair parenthetical combinations
+# simple expression, '|' boolean operator (meaning 'or')
+context = value1 | context = value2
+(context = value1) | context = value2
+context = value1 | (context = value2)
+(context = value1) | (context = value2)
+
+
+# single-pair parenthetical combinations
+# simple expression, no boolean operator (implies 'and' semantics)
+context = value context = value
+(context = value) context = value
+context = value (context = value)
+(context = value) (context = value)
+
+
+
+# double-pair parenthetical combinations
+# simple expression, '|' boolean operator (meaning 'or')
+((context = value1 | context = value2))
+((context = value1) | context = value2)
+((context = value1)) | context = value2
+(context = value1) | (context = value2)
+(context = value1 | (context = value2))
+context = value1 | ((context = value2))
+
+# double-pair parenthetical combinations
+# simple expression, no boolean operator (implies 'and' semantics)
+((context = value1 context = value2))
+((context = value1) context = value2)
+((context = value1)) context = value2
+(context = value1) (context = value2)
+(context = value1 (context = value2))
+context = value1 ((context = value2))
+
+# simple terms
+hello
+hello world
+"hello world" 'foo bar'
+'hello world' "foo bar"
+hello | world
+context=value | world
\ No newline at end of file
Show replies by date