|
 |
b35d98 |
From c252b9c40ad888aac5e5dc3054f624075e0533d3 Mon Sep 17 00:00:00 2001
|
|
|
b35d98 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
b35d98 |
Date: Fri, 17 Jan 2014 11:57:23 +0100
|
|
|
b35d98 |
Subject: [PATCH 27/39] Do not ship own reporting workflow definitions
|
|
|
b35d98 |
|
|
|
b35d98 |
Related to rhbz#1054720
|
|
|
b35d98 |
---
|
|
|
b35d98 |
etc/CMakeLists.txt | 10 ++--------
|
|
|
b35d98 |
etc/java_event.conf | 19 +++++++++++++++++++
|
|
|
b35d98 |
etc/java_event_fedora.conf | 19 -------------------
|
|
|
b35d98 |
etc/java_event_fedora.conf.5 | 15 ---------------
|
|
|
b35d98 |
etc/java_event_rhel.conf | 2 --
|
|
|
b35d98 |
etc/java_event_rhel.conf.5 | 15 ---------------
|
|
|
b35d98 |
etc/report_fedora_java.conf | 3 ---
|
|
|
b35d98 |
etc/report_fedora_java.conf.5 | 32 --------------------------------
|
|
|
b35d98 |
etc/report_rhel_java.conf | 3 ---
|
|
|
b35d98 |
etc/report_rhel_java.conf.5 | 32 --------------------------------
|
|
|
b35d98 |
etc/workflow_FedoraJava.xml | 11 -----------
|
|
|
b35d98 |
etc/workflow_RHELJava.xml | 9 ---------
|
|
|
b35d98 |
12 files changed, 21 insertions(+), 149 deletions(-)
|
|
|
b35d98 |
delete mode 100644 etc/java_event_fedora.conf
|
|
|
b35d98 |
delete mode 100644 etc/java_event_fedora.conf.5
|
|
|
b35d98 |
delete mode 100644 etc/java_event_rhel.conf
|
|
|
b35d98 |
delete mode 100644 etc/java_event_rhel.conf.5
|
|
|
b35d98 |
delete mode 100644 etc/report_fedora_java.conf
|
|
|
b35d98 |
delete mode 100644 etc/report_fedora_java.conf.5
|
|
|
b35d98 |
delete mode 100644 etc/report_rhel_java.conf
|
|
|
b35d98 |
delete mode 100644 etc/report_rhel_java.conf.5
|
|
|
b35d98 |
delete mode 100644 etc/workflow_FedoraJava.xml
|
|
|
b35d98 |
delete mode 100644 etc/workflow_RHELJava.xml
|
|
|
b35d98 |
|
|
|
b35d98 |
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
|
|
|
b35d98 |
index 79e739c..e7b4521 100644
|
|
|
b35d98 |
--- a/etc/CMakeLists.txt
|
|
|
b35d98 |
+++ b/etc/CMakeLists.txt
|
|
|
b35d98 |
@@ -1,14 +1,8 @@
|
|
|
b35d98 |
-install(FILES java_event.conf java_event_fedora.conf java_event_rhel.conf
|
|
|
b35d98 |
+install(FILES java_event.conf
|
|
|
b35d98 |
DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/events.d)
|
|
|
b35d98 |
|
|
|
b35d98 |
-install(FILES report_fedora_java.conf report_rhel_java.conf
|
|
|
b35d98 |
- DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/workflows.d)
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-install(FILES java_event.conf.5 java_event_rhel.conf.5 report_rhel_java.conf.5 bugzilla_format_java.conf.5 bugzilla_formatdup_java.conf.5 java_event_fedora.conf.5 report_fedora_java.conf.5
|
|
|
b35d98 |
+install(FILES java_event.conf.5 bugzilla_format_java.conf.5 bugzilla_formatdup_java.conf.5
|
|
|
b35d98 |
DESTINATION ${MAN_INSTALL_DIR}/man5)
|
|
|
b35d98 |
|
|
|
b35d98 |
-install(FILES workflow_FedoraJava.xml workflow_RHELJava.xml
|
|
|
b35d98 |
- DESTINATION ${SHARE_INSTALL_PREFIX}/libreport/workflows)
|
|
|
b35d98 |
-
|
|
|
b35d98 |
install(FILES bugzilla_format_java.conf bugzilla_formatdup_java.conf
|
|
|
b35d98 |
DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/plugins)
|
|
|
b35d98 |
diff --git a/etc/java_event.conf b/etc/java_event.conf
|
|
|
b35d98 |
index f855a9d..4610f0c 100644
|
|
|
b35d98 |
--- a/etc/java_event.conf
|
|
|
b35d98 |
+++ b/etc/java_event.conf
|
|
|
b35d98 |
@@ -16,6 +16,25 @@ EVENT=post-create type=Java
|
|
|
b35d98 |
echo "Cannot create 'duphas' nor 'uuid' because of missing 'backtrace' file"
|
|
|
b35d98 |
fi
|
|
|
b35d98 |
|
|
|
b35d98 |
+# Create a bug in Bugzilla
|
|
|
b35d98 |
+EVENT=report_Bugzilla type=Java
|
|
|
b35d98 |
+ reporter-bugzilla -b \
|
|
|
b35d98 |
+ -c /etc/libreport/plugins/bugzilla.conf \
|
|
|
b35d98 |
+ -F /etc/libreport/plugins/bugzilla_format_java.conf \
|
|
|
b35d98 |
+ -A /etc/libreport/plugins/bugzilla_formatdup_java.conf
|
|
|
b35d98 |
+
|
|
|
b35d98 |
+# Send micro report
|
|
|
b35d98 |
+EVENT=report_uReport type=Java
|
|
|
b35d98 |
+ /usr/libexec/abrt-action-ureport
|
|
|
b35d98 |
+
|
|
|
b35d98 |
+# update ABRT database after successful report to bugzilla
|
|
|
b35d98 |
+EVENT=post_report type=Java
|
|
|
b35d98 |
+ reporter-ureport -A -B
|
|
|
b35d98 |
+ exit 0
|
|
|
b35d98 |
+
|
|
|
b35d98 |
# Reporting of java exceptions
|
|
|
b35d98 |
EVENT=report-gui type=Java
|
|
|
b35d98 |
report-gtk -- "$DUMP_DIR"
|
|
|
b35d98 |
+
|
|
|
b35d98 |
+EVENT=report-cli type=Java
|
|
|
b35d98 |
+ report-cli -- "$DUMP_DIR"
|
|
|
b35d98 |
diff --git a/etc/java_event_fedora.conf b/etc/java_event_fedora.conf
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 25fcd16..0000000
|
|
|
b35d98 |
--- a/etc/java_event_fedora.conf
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,19 +0,0 @@
|
|
|
b35d98 |
-EVENT=report_Bugzilla type=Java
|
|
|
b35d98 |
- reporter-bugzilla -b \
|
|
|
b35d98 |
- -c /etc/libreport/plugins/bugzilla.conf \
|
|
|
b35d98 |
- -F /etc/libreport/plugins/bugzilla_format_java.conf \
|
|
|
b35d98 |
- -A /etc/libreport/plugins/bugzilla_formatdup_java.conf
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-# Send micro report
|
|
|
b35d98 |
-EVENT=report_uReport type=Java
|
|
|
b35d98 |
- # disabled until abrt switches to satyr
|
|
|
b35d98 |
- # /usr/libexec/abrt-action-ureport
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-# update ABRT database after successful report to bugzilla
|
|
|
b35d98 |
-EVENT=post_report type=Java
|
|
|
b35d98 |
- # disabled until abrt switches to satyr
|
|
|
b35d98 |
- # reporter-ureport -r
|
|
|
b35d98 |
- # exit 0
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-EVENT=report-cli type=Java
|
|
|
b35d98 |
- report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
|
|
|
b35d98 |
diff --git a/etc/java_event_fedora.conf.5 b/etc/java_event_fedora.conf.5
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 3f6fe7e..0000000
|
|
|
b35d98 |
--- a/etc/java_event_fedora.conf.5
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,15 +0,0 @@
|
|
|
b35d98 |
-.\" Process this file with
|
|
|
b35d98 |
-.\" groff -man -Tascii java_event_fedora.conf.5
|
|
|
b35d98 |
-.\"
|
|
|
b35d98 |
-.TH java_event_fedora.conf 5 "JULY 2013" abrt-java-connector "User Manuals"
|
|
|
b35d98 |
-.SH NAME
|
|
|
b35d98 |
-java_event_fedora.conf \- configuration file for libreport\&.
|
|
|
b35d98 |
-.SH DESCRIPTION
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file provides definitions of events for Java exception problems\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-By default the file contains definition for \fIreport-cli\fR, \fIpost-report\fR, \fIreport_uReport\fR and \fIreport_Bugzilla\fR events\&.
|
|
|
b35d98 |
-.SH AUTHOR
|
|
|
b35d98 |
-Jakub Filak <jfilak at redhat dot com>
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.BR report_event.conf (5)
|
|
|
b35d98 |
diff --git a/etc/java_event_rhel.conf b/etc/java_event_rhel.conf
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index c1fc6d5..0000000
|
|
|
b35d98 |
--- a/etc/java_event_rhel.conf
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,2 +0,0 @@
|
|
|
b35d98 |
-EVENT=report-cli type=Java
|
|
|
b35d98 |
- report-cli -e report_RHTSupport -- "$DUMP_DIR"
|
|
|
b35d98 |
diff --git a/etc/java_event_rhel.conf.5 b/etc/java_event_rhel.conf.5
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index b376a8a..0000000
|
|
|
b35d98 |
--- a/etc/java_event_rhel.conf.5
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,15 +0,0 @@
|
|
|
b35d98 |
-.\" Process this file with
|
|
|
b35d98 |
-.\" groff -man -Tascii java_event_rhel.conf.5
|
|
|
b35d98 |
-.\"
|
|
|
b35d98 |
-.TH java_event_rhel.conf 5 "JULY 2013" abrt-java-connector "User Manuals"
|
|
|
b35d98 |
-.SH NAME
|
|
|
b35d98 |
-java_event_rhel.conf \- configuration file for libreport\&.
|
|
|
b35d98 |
-.SH DESCRIPTION
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file provides definitions of events for Java exception problems\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-By default the file contains definition for \fIreport-cli\fR event.
|
|
|
b35d98 |
-.SH AUTHOR
|
|
|
b35d98 |
-Jakub Filak <jfilak at redhat dot com>
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.BR report_event.conf (5)
|
|
|
b35d98 |
diff --git a/etc/report_fedora_java.conf b/etc/report_fedora_java.conf
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 792d3cc..0000000
|
|
|
b35d98 |
--- a/etc/report_fedora_java.conf
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,3 +0,0 @@
|
|
|
b35d98 |
-EVENT=workflow_FedoraJava analyzer=Java
|
|
|
b35d98 |
-# this is just a meta event which consists of other events
|
|
|
b35d98 |
-# the list is defined in the xml file
|
|
|
b35d98 |
diff --git a/etc/report_fedora_java.conf.5 b/etc/report_fedora_java.conf.5
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index f2e247d..0000000
|
|
|
b35d98 |
--- a/etc/report_fedora_java.conf.5
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,32 +0,0 @@
|
|
|
b35d98 |
-.\" Process this file with
|
|
|
b35d98 |
-.\" groff -man -Tascii report_java_fedora.conf.5
|
|
|
b35d98 |
-.\"
|
|
|
b35d98 |
-.TH report_java_fedora.conf 5 "JULY 2013" "abrt-java-connector" "User Manuals"
|
|
|
b35d98 |
-.SH NAME
|
|
|
b35d98 |
-report_java_fedora.conf \- configuration file for libreport\&.
|
|
|
b35d98 |
-.SH "DESCRIPTION"
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file specifies which of the reporting work flow definitions are applicable for Java problems types on Fedora\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-All applicable reporting work flows are presented to users in User Interface as possibilities for processing of a particular problem\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file consists from one condition per line\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-Each condition line must start with EVENT=workflow_NAME where "workflow_" is constant prefix and "workflow_NAME" is base name of path to reporting work flow configuration file\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-The rest of condition line has form VAR=VAL, VAR!=VAL or VAL~=REGEX, where VAR is a name of problem directory element to be checked (for example, "executable", "package", hostname" etc)\&. The condition may consists from as many element checks as it is necessary\&.
|
|
|
b35d98 |
-.SH "EXAMPLES"
|
|
|
b35d98 |
-.PP
|
|
|
b35d98 |
-Condition line
|
|
|
b35d98 |
-.RS 4
|
|
|
b35d98 |
-EVENT=workflow_FedoraJava analyzer=Java
|
|
|
b35d98 |
-.RE
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-The condition line above expects existence of /usr/share/libreport/workflows/workflow_FedoraJava\&.xml
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-report\-gtk(1)
|
|
|
b35d98 |
-.SH AUTHOR
|
|
|
b35d98 |
-Jakub Filak <jfilak at redhat dot com>
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.BR report_event.conf (5)
|
|
|
b35d98 |
diff --git a/etc/report_rhel_java.conf b/etc/report_rhel_java.conf
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 214522a..0000000
|
|
|
b35d98 |
--- a/etc/report_rhel_java.conf
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,3 +0,0 @@
|
|
|
b35d98 |
-EVENT=workflow_RHELJava analyzer=Java
|
|
|
b35d98 |
-# this is just a meta event which consists of other events
|
|
|
b35d98 |
-# the list is defined in the xml file
|
|
|
b35d98 |
diff --git a/etc/report_rhel_java.conf.5 b/etc/report_rhel_java.conf.5
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 3704b39..0000000
|
|
|
b35d98 |
--- a/etc/report_rhel_java.conf.5
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,32 +0,0 @@
|
|
|
b35d98 |
-.\" Process this file with
|
|
|
b35d98 |
-.\" groff -man -Tascii report_java_rhel.conf.5
|
|
|
b35d98 |
-.\"
|
|
|
b35d98 |
-.TH REPORT_JAVA_RHEL.CONF 5 "JULY 2013" "abrt-java-connector" "User Manuals"
|
|
|
b35d98 |
-.SH NAME
|
|
|
b35d98 |
-report_java_rhel.conf \- configuration file for libreport\&.
|
|
|
b35d98 |
-.SH "DESCRIPTION"
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file specifies which of the reporting work flow definitions are applicable for Java problems types on Red Hat Enterprise Linux\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-All applicable reporting work flows are presented to users in User Interface as possibilities for processing of a particular problem\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-This configuration file consists from one condition per line\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-Each condition line must start with EVENT=workflow_NAME where "workflow_" is constant prefix and "workflow_NAME" is base name of path to reporting work flow configuration file\&.
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-The rest of condition line has form VAR=VAL, VAR!=VAL or VAL~=REGEX, where VAR is a name of problem directory element to be checked (for example, "executable", "package", hostname" etc)\&. The condition may consists from as many element checks as it is necessary\&.
|
|
|
b35d98 |
-.SH "EXAMPLES"
|
|
|
b35d98 |
-.PP
|
|
|
b35d98 |
-Condition line
|
|
|
b35d98 |
-.RS 4
|
|
|
b35d98 |
-EVENT=workflow_RHELJava analyzer=Java
|
|
|
b35d98 |
-.RE
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-The condition line above expects existence of /usr/share/libreport/workflows/workflow_RHELJava\&.xml
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.sp
|
|
|
b35d98 |
-report\-gtk(1)
|
|
|
b35d98 |
-.SH AUTHOR
|
|
|
b35d98 |
-Jakub Filak <jfilak at redhat dot com>
|
|
|
b35d98 |
-.SH "SEE ALSO"
|
|
|
b35d98 |
-.BR report_event.conf (5)
|
|
|
b35d98 |
diff --git a/etc/workflow_FedoraJava.xml b/etc/workflow_FedoraJava.xml
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index 4520042..0000000
|
|
|
b35d98 |
--- a/etc/workflow_FedoraJava.xml
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,11 +0,0 @@
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-<workflow>
|
|
|
b35d98 |
- <name>Report to Fedora</name>
|
|
|
b35d98 |
- <description>Process the Java excption using the Fedora infrastructure</description>
|
|
|
b35d98 |
-
|
|
|
b35d98 |
- <events>
|
|
|
b35d98 |
- <event>report_uReport</event>
|
|
|
b35d98 |
- <event>report_Bugzilla</event>
|
|
|
b35d98 |
- <event>post-report</event>
|
|
|
b35d98 |
- </events>
|
|
|
b35d98 |
-</workflow>
|
|
|
b35d98 |
diff --git a/etc/workflow_RHELJava.xml b/etc/workflow_RHELJava.xml
|
|
|
b35d98 |
deleted file mode 100644
|
|
|
b35d98 |
index e1f5b8a..0000000
|
|
|
b35d98 |
--- a/etc/workflow_RHELJava.xml
|
|
|
b35d98 |
+++ /dev/null
|
|
|
b35d98 |
@@ -1,9 +0,0 @@
|
|
|
b35d98 |
-
|
|
|
b35d98 |
-<workflow>
|
|
|
b35d98 |
- <name>Report to Red Hat</name>
|
|
|
b35d98 |
- <description>Process the Java exception using the Red Hat infrastructure</description>
|
|
|
b35d98 |
-
|
|
|
b35d98 |
- <events>
|
|
|
b35d98 |
- <event>report_RHTSupport</event>
|
|
|
b35d98 |
- </events>
|
|
|
b35d98 |
-</workflow>
|
|
|
b35d98 |
--
|
|
|
b35d98 |
1.8.3.1
|
|
|
b35d98 |
|