Blob Blame Raw
From c252b9c40ad888aac5e5dc3054f624075e0533d3 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Fri, 17 Jan 2014 11:57:23 +0100
Subject: [PATCH 27/39] Do not ship own reporting workflow definitions

Related to rhbz#1054720
---
 etc/CMakeLists.txt            | 10 ++--------
 etc/java_event.conf           | 19 +++++++++++++++++++
 etc/java_event_fedora.conf    | 19 -------------------
 etc/java_event_fedora.conf.5  | 15 ---------------
 etc/java_event_rhel.conf      |  2 --
 etc/java_event_rhel.conf.5    | 15 ---------------
 etc/report_fedora_java.conf   |  3 ---
 etc/report_fedora_java.conf.5 | 32 --------------------------------
 etc/report_rhel_java.conf     |  3 ---
 etc/report_rhel_java.conf.5   | 32 --------------------------------
 etc/workflow_FedoraJava.xml   | 11 -----------
 etc/workflow_RHELJava.xml     |  9 ---------
 12 files changed, 21 insertions(+), 149 deletions(-)
 delete mode 100644 etc/java_event_fedora.conf
 delete mode 100644 etc/java_event_fedora.conf.5
 delete mode 100644 etc/java_event_rhel.conf
 delete mode 100644 etc/java_event_rhel.conf.5
 delete mode 100644 etc/report_fedora_java.conf
 delete mode 100644 etc/report_fedora_java.conf.5
 delete mode 100644 etc/report_rhel_java.conf
 delete mode 100644 etc/report_rhel_java.conf.5
 delete mode 100644 etc/workflow_FedoraJava.xml
 delete mode 100644 etc/workflow_RHELJava.xml

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 79e739c..e7b4521 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -1,14 +1,8 @@
-install(FILES java_event.conf java_event_fedora.conf java_event_rhel.conf
+install(FILES java_event.conf
         DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/events.d)
 
-install(FILES report_fedora_java.conf report_rhel_java.conf
-        DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/workflows.d)
-
-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
+install(FILES java_event.conf.5 bugzilla_format_java.conf.5 bugzilla_formatdup_java.conf.5
         DESTINATION ${MAN_INSTALL_DIR}/man5)
 
-install(FILES workflow_FedoraJava.xml workflow_RHELJava.xml
-        DESTINATION ${SHARE_INSTALL_PREFIX}/libreport/workflows)
-
 install(FILES bugzilla_format_java.conf bugzilla_formatdup_java.conf
         DESTINATION ${SYSCONF_INSTALL_DIR}/libreport/plugins)
diff --git a/etc/java_event.conf b/etc/java_event.conf
index f855a9d..4610f0c 100644
--- a/etc/java_event.conf
+++ b/etc/java_event.conf
@@ -16,6 +16,25 @@ EVENT=post-create type=Java
             echo "Cannot create 'duphas' nor 'uuid' because of missing 'backtrace' file"
         fi
 
+# Create a bug in Bugzilla
+EVENT=report_Bugzilla type=Java
+        reporter-bugzilla -b \
+                -c /etc/libreport/plugins/bugzilla.conf \
+                -F /etc/libreport/plugins/bugzilla_format_java.conf \
+                -A /etc/libreport/plugins/bugzilla_formatdup_java.conf
+
+# Send micro report
+EVENT=report_uReport type=Java
+        /usr/libexec/abrt-action-ureport
+
+# update ABRT database after successful report to bugzilla
+EVENT=post_report type=Java
+        reporter-ureport -A -B
+        exit 0
+
 # Reporting of java exceptions
 EVENT=report-gui type=Java
         report-gtk -- "$DUMP_DIR"
+
+EVENT=report-cli type=Java
+        report-cli -- "$DUMP_DIR"
diff --git a/etc/java_event_fedora.conf b/etc/java_event_fedora.conf
deleted file mode 100644
index 25fcd16..0000000
--- a/etc/java_event_fedora.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-EVENT=report_Bugzilla type=Java
-        reporter-bugzilla -b \
-                -c /etc/libreport/plugins/bugzilla.conf \
-                -F /etc/libreport/plugins/bugzilla_format_java.conf \
-                -A /etc/libreport/plugins/bugzilla_formatdup_java.conf
-
-# Send micro report
-EVENT=report_uReport type=Java
-        # disabled until abrt switches to satyr
-        # /usr/libexec/abrt-action-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report type=Java
-        # disabled until abrt switches to satyr
-        # reporter-ureport -r
-        # exit 0
-
-EVENT=report-cli type=Java
-        report-cli -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
diff --git a/etc/java_event_fedora.conf.5 b/etc/java_event_fedora.conf.5
deleted file mode 100644
index 3f6fe7e..0000000
--- a/etc/java_event_fedora.conf.5
+++ /dev/null
@@ -1,15 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii java_event_fedora.conf.5
-.\"
-.TH java_event_fedora.conf 5 "JULY 2013" abrt-java-connector "User Manuals"
-.SH NAME
-java_event_fedora.conf \- configuration file for libreport\&.
-.SH DESCRIPTION
-.sp
-This configuration file provides definitions of events for Java exception problems\&.
-.sp
-By default the file contains definition for \fIreport-cli\fR, \fIpost-report\fR, \fIreport_uReport\fR and \fIreport_Bugzilla\fR events\&.
-.SH AUTHOR
-Jakub Filak <jfilak at redhat dot com>
-.SH "SEE ALSO"
-.BR report_event.conf (5)
diff --git a/etc/java_event_rhel.conf b/etc/java_event_rhel.conf
deleted file mode 100644
index c1fc6d5..0000000
--- a/etc/java_event_rhel.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-EVENT=report-cli type=Java
-        report-cli  -e report_RHTSupport -- "$DUMP_DIR"
diff --git a/etc/java_event_rhel.conf.5 b/etc/java_event_rhel.conf.5
deleted file mode 100644
index b376a8a..0000000
--- a/etc/java_event_rhel.conf.5
+++ /dev/null
@@ -1,15 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii java_event_rhel.conf.5
-.\"
-.TH java_event_rhel.conf 5 "JULY 2013" abrt-java-connector "User Manuals"
-.SH NAME
-java_event_rhel.conf \- configuration file for libreport\&.
-.SH DESCRIPTION
-.sp
-This configuration file provides definitions of events for Java exception problems\&.
-.sp
-By default the file contains definition for \fIreport-cli\fR event.
-.SH AUTHOR
-Jakub Filak <jfilak at redhat dot com>
-.SH "SEE ALSO"
-.BR report_event.conf (5)
diff --git a/etc/report_fedora_java.conf b/etc/report_fedora_java.conf
deleted file mode 100644
index 792d3cc..0000000
--- a/etc/report_fedora_java.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-EVENT=workflow_FedoraJava analyzer=Java
-# this is just a meta event which consists of other events
-# the list is defined in the xml file
diff --git a/etc/report_fedora_java.conf.5 b/etc/report_fedora_java.conf.5
deleted file mode 100644
index f2e247d..0000000
--- a/etc/report_fedora_java.conf.5
+++ /dev/null
@@ -1,32 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii report_java_fedora.conf.5
-.\"
-.TH report_java_fedora.conf 5 "JULY 2013" "abrt-java-connector" "User Manuals"
-.SH NAME
-report_java_fedora.conf \- configuration file for libreport\&.
-.SH "DESCRIPTION"
-.sp
-This configuration file specifies which of the reporting work flow definitions are applicable for Java problems types on Fedora\&.
-.sp
-All applicable reporting work flows are presented to users in User Interface as possibilities for processing of a particular problem\&.
-.sp
-This configuration file consists from one condition per line\&.
-.sp
-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\&.
-.sp
-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\&.
-.SH "EXAMPLES"
-.PP
-Condition line
-.RS 4
-EVENT=workflow_FedoraJava analyzer=Java
-.RE
-.sp
-The condition line above expects existence of /usr/share/libreport/workflows/workflow_FedoraJava\&.xml
-.SH "SEE ALSO"
-.sp
-report\-gtk(1)
-.SH AUTHOR
-Jakub Filak <jfilak at redhat dot com>
-.SH "SEE ALSO"
-.BR report_event.conf (5)
diff --git a/etc/report_rhel_java.conf b/etc/report_rhel_java.conf
deleted file mode 100644
index 214522a..0000000
--- a/etc/report_rhel_java.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-EVENT=workflow_RHELJava analyzer=Java
-# this is just a meta event which consists of other events
-# the list is defined in the xml file
diff --git a/etc/report_rhel_java.conf.5 b/etc/report_rhel_java.conf.5
deleted file mode 100644
index 3704b39..0000000
--- a/etc/report_rhel_java.conf.5
+++ /dev/null
@@ -1,32 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii report_java_rhel.conf.5
-.\"
-.TH REPORT_JAVA_RHEL.CONF 5 "JULY 2013" "abrt-java-connector" "User Manuals"
-.SH NAME
-report_java_rhel.conf \- configuration file for libreport\&.
-.SH "DESCRIPTION"
-.sp
-This configuration file specifies which of the reporting work flow definitions are applicable for Java problems types on Red Hat Enterprise Linux\&.
-.sp
-All applicable reporting work flows are presented to users in User Interface as possibilities for processing of a particular problem\&.
-.sp
-This configuration file consists from one condition per line\&.
-.sp
-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\&.
-.sp
-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\&.
-.SH "EXAMPLES"
-.PP
-Condition line
-.RS 4
-EVENT=workflow_RHELJava analyzer=Java
-.RE
-.sp
-The condition line above expects existence of /usr/share/libreport/workflows/workflow_RHELJava\&.xml
-.SH "SEE ALSO"
-.sp
-report\-gtk(1)
-.SH AUTHOR
-Jakub Filak <jfilak at redhat dot com>
-.SH "SEE ALSO"
-.BR report_event.conf (5)
diff --git a/etc/workflow_FedoraJava.xml b/etc/workflow_FedoraJava.xml
deleted file mode 100644
index 4520042..0000000
--- a/etc/workflow_FedoraJava.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflow>
-    <name>Report to Fedora</name>
-    <description>Process the Java excption using the Fedora infrastructure</description>
-
-    <events>
-        <event>report_uReport</event>
-        <event>report_Bugzilla</event>
-        <event>post-report</event>
-    </events>
-</workflow>
diff --git a/etc/workflow_RHELJava.xml b/etc/workflow_RHELJava.xml
deleted file mode 100644
index e1f5b8a..0000000
--- a/etc/workflow_RHELJava.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<workflow>
-    <name>Report to Red Hat</name>
-    <description>Process the Java exception using the Red Hat infrastructure</description>
-
-    <events>
-        <event>report_RHTSupport</event>
-    </events>
-</workflow>
-- 
1.8.3.1