From 25877dd9f0b24ffce1eb978ed32fd2fd06d04f66 Mon Sep 17 00:00:00 2001 From: Steve Millidge Date: Fri, 24 Feb 2017 07:11:30 +0000 Subject: [PATCH] PAYARA-1480 split out individual notifiers into individual packages (#1412) Moved event bus to nucleus as it only depends on nucleus Modified feature sets to include correct notifiers --- .../payara-micro-distribution/build.xml | 12 +- .../build.xml | 9 +- appserver/featuresets/payara-web/pom.xml | 31 ++++ appserver/featuresets/payara/pom.xml | 7 + appserver/packager/notification-email/pom.xml | 113 +++++++++++++ .../src/main/assembly/notification-email.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ .../packager/notification-hipchat/pom.xml | 114 +++++++++++++ .../main/assembly/notification-hipchat.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ appserver/packager/notification-jms/pom.xml | 114 +++++++++++++ .../src/main/assembly/notification-jms.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ appserver/packager/notification-slack/pom.xml | 114 +++++++++++++ .../src/main/assembly/notification-slack.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ appserver/packager/notification-snmp/pom.xml | 119 +++++++++++++ .../src/main/assembly/notification-snmp.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ appserver/packager/notification-xmpp/pom.xml | 160 ++++++++++++++++++ .../src/main/assembly/notification-xmpp.xml | 66 ++++++++ .../src/main/resources/pkg_proto.py | 58 +++++++ appserver/packager/notification/pom.xml | 37 ---- appserver/packager/pom.xml | 6 + appserver/payara-appserver-modules/pom.xml | 1 - nucleus/packager/notification-package/pom.xml | 83 +-------- .../notification-eventbus-core/pom.xml | 8 +- .../eventbus/EventbusMessage.java | 0 .../eventbus/EventbusMessageQueue.java | 0 .../EventbusNotificationConfigurer.java | 0 .../eventbus/EventbusNotificationEvent.java | 0 .../EventbusNotificationEventFactory.java | 0 .../EventbusNotifierConfiguration.java | 0 ...NotifierConfigurationExecutionOptions.java | 0 ...rConfigurationExecutionOptionsFactory.java | 0 .../EventbusNotifierExecutionOptions.java | 0 ...entbusNotifierExecutionOptionsFactory.java | 0 .../eventbus/EventbusNotifierService.java | 0 .../GetEventbusNotifierConfiguration.java | 0 nucleus/payara-modules/pom.xml | 1 + 40 files changed, 1531 insertions(+), 142 deletions(-) create mode 100644 appserver/packager/notification-email/pom.xml create mode 100644 appserver/packager/notification-email/src/main/assembly/notification-email.xml create mode 100644 appserver/packager/notification-email/src/main/resources/pkg_proto.py create mode 100644 appserver/packager/notification-hipchat/pom.xml create mode 100644 appserver/packager/notification-hipchat/src/main/assembly/notification-hipchat.xml create mode 100644 appserver/packager/notification-hipchat/src/main/resources/pkg_proto.py create mode 100644 appserver/packager/notification-jms/pom.xml create mode 100644 appserver/packager/notification-jms/src/main/assembly/notification-jms.xml create mode 100644 appserver/packager/notification-jms/src/main/resources/pkg_proto.py create mode 100644 appserver/packager/notification-slack/pom.xml create mode 100644 appserver/packager/notification-slack/src/main/assembly/notification-slack.xml create mode 100644 appserver/packager/notification-slack/src/main/resources/pkg_proto.py create mode 100644 appserver/packager/notification-snmp/pom.xml create mode 100644 appserver/packager/notification-snmp/src/main/assembly/notification-snmp.xml create mode 100644 appserver/packager/notification-snmp/src/main/resources/pkg_proto.py create mode 100644 appserver/packager/notification-xmpp/pom.xml create mode 100644 appserver/packager/notification-xmpp/src/main/assembly/notification-xmpp.xml create mode 100644 appserver/packager/notification-xmpp/src/main/resources/pkg_proto.py rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/pom.xml (94%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessage.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessageQueue.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationConfigurer.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEvent.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEventFactory.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfiguration.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptions.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptionsFactory.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptions.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptionsFactory.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierService.java (100%) rename {appserver/payara-appserver-modules => nucleus/payara-modules}/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/GetEventbusNotifierConfiguration.java (100%) diff --git a/appserver/extras/payara-micro/payara-micro-distribution/build.xml b/appserver/extras/payara-micro/payara-micro-distribution/build.xml index e063a8c08eb..a8b21c5358b 100644 --- a/appserver/extras/payara-micro/payara-micro-distribution/build.xml +++ b/appserver/extras/payara-micro/payara-micro-distribution/build.xml @@ -109,17 +109,11 @@ - - - - - - - - + + @@ -129,8 +123,6 @@ - - diff --git a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/build.xml b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/build.xml index 19db2d2b59e..b1a2cdc5055 100644 --- a/appserver/extras/payara-micro/payara-micro-microprofile-distribution/build.xml +++ b/appserver/extras/payara-micro/payara-micro-microprofile-distribution/build.xml @@ -111,16 +111,9 @@ - - - - - - - - + diff --git a/appserver/featuresets/payara-web/pom.xml b/appserver/featuresets/payara-web/pom.xml index fc599116f0e..150b2d567ab 100644 --- a/appserver/featuresets/payara-web/pom.xml +++ b/appserver/featuresets/payara-web/pom.xml @@ -151,12 +151,43 @@ ${project.version} zip + org.glassfish.main.packager notification ${project.version} zip + + org.glassfish.main.packager + notification-email + ${project.version} + zip + + + org.glassfish.main.packager + notification-hipchat + ${project.version} + zip + + + org.glassfish.main.packager + notification-slack + ${project.version} + zip + + + org.glassfish.main.packager + notification-snmp + ${project.version} + zip + + + org.glassfish.main.packager + notification-xmpp + ${project.version} + zip + org.glassfish.main.packager asadmin-recorder diff --git a/appserver/featuresets/payara/pom.xml b/appserver/featuresets/payara/pom.xml index 8405bab8f08..550b5483491 100644 --- a/appserver/featuresets/payara/pom.xml +++ b/appserver/featuresets/payara/pom.xml @@ -124,5 +124,12 @@ ${project.version} zip + + + org.glassfish.main.packager + notification-jms + ${project.version} + zip + diff --git a/appserver/packager/notification-email/pom.xml b/appserver/packager/notification-email/pom.xml new file mode 100644 index 00000000000..259d8504065 --- /dev/null +++ b/appserver/packager/notification-email/pom.xml @@ -0,0 +1,113 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-email + eMail Notification Package + distribution-fragment + This pom describes how to assemble the eMail Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + fish.payara.appserver + notification-email-core + ${project.version} + + + fish.payara.admingui + email-notifier-console-plugin + ${project.version} + true + + + + diff --git a/appserver/packager/notification-email/src/main/assembly/notification-email.xml b/appserver/packager/notification-email/src/main/assembly/notification-email.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-email/src/main/assembly/notification-email.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-email/src/main/resources/pkg_proto.py b/appserver/packager/notification-email/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..34c5b4071e7 --- /dev/null +++ b/appserver/packager/notification-email/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-email", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Notification eMail Integration", + "pkg.description" : "Notification eMail module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification-hipchat/pom.xml b/appserver/packager/notification-hipchat/pom.xml new file mode 100644 index 00000000000..32381a8d352 --- /dev/null +++ b/appserver/packager/notification-hipchat/pom.xml @@ -0,0 +1,114 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-hipchat + HipChat Notification Package + distribution-fragment + This pom describes how to assemble the HipChat Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + + fish.payara.appserver + notification-hipchat-core + ${project.version} + + + fish.payara.admingui + hipchat-notifier-console-plugin + ${project.version} + true + + + + diff --git a/appserver/packager/notification-hipchat/src/main/assembly/notification-hipchat.xml b/appserver/packager/notification-hipchat/src/main/assembly/notification-hipchat.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-hipchat/src/main/assembly/notification-hipchat.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-hipchat/src/main/resources/pkg_proto.py b/appserver/packager/notification-hipchat/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..83c31c7a611 --- /dev/null +++ b/appserver/packager/notification-hipchat/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-hipchat", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Hipchat Notification Services Integration", + "pkg.description" : "Notification HipChat module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification-jms/pom.xml b/appserver/packager/notification-jms/pom.xml new file mode 100644 index 00000000000..b14420fb17e --- /dev/null +++ b/appserver/packager/notification-jms/pom.xml @@ -0,0 +1,114 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-jms + JMS Notification Package + distribution-fragment + This pom describes how to assemble the JMS Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + + fish.payara.appserver + notification-jms-core + ${project.version} + + + fish.payara.admingui + jms-notifier-console-plugin + ${project.version} + true + + + + diff --git a/appserver/packager/notification-jms/src/main/assembly/notification-jms.xml b/appserver/packager/notification-jms/src/main/assembly/notification-jms.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-jms/src/main/assembly/notification-jms.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-jms/src/main/resources/pkg_proto.py b/appserver/packager/notification-jms/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..605e8e1b9df --- /dev/null +++ b/appserver/packager/notification-jms/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-jms", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Notification JMS Integration", + "pkg.description" : "Notification JMS module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification-slack/pom.xml b/appserver/packager/notification-slack/pom.xml new file mode 100644 index 00000000000..f974fae1c9a --- /dev/null +++ b/appserver/packager/notification-slack/pom.xml @@ -0,0 +1,114 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-slack + Slack Notification Package + distribution-fragment + This pom describes how to assemble the Slack Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + + fish.payara.admingui + slack-notifier-console-plugin + ${project.version} + true + + + fish.payara.appserver + notification-slack-core + ${project.version} + + + + diff --git a/appserver/packager/notification-slack/src/main/assembly/notification-slack.xml b/appserver/packager/notification-slack/src/main/assembly/notification-slack.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-slack/src/main/assembly/notification-slack.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-slack/src/main/resources/pkg_proto.py b/appserver/packager/notification-slack/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..6eb557000f7 --- /dev/null +++ b/appserver/packager/notification-slack/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-slack", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Notification Slack Integration", + "pkg.description" : "Notification Slack module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification-snmp/pom.xml b/appserver/packager/notification-snmp/pom.xml new file mode 100644 index 00000000000..2e7da09c6f2 --- /dev/null +++ b/appserver/packager/notification-snmp/pom.xml @@ -0,0 +1,119 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-snmp + SNMP Notification Package + distribution-fragment + This pom describes how to assemble the SNMP Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + + fish.payara.appserver + notification-snmp-core + ${project.version} + + + org.snmp4j + snmp4j + ${snmp4j.version} + + + fish.payara.admingui + snmp-notifier-console-plugin + ${project.version} + true + + + + diff --git a/appserver/packager/notification-snmp/src/main/assembly/notification-snmp.xml b/appserver/packager/notification-snmp/src/main/assembly/notification-snmp.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-snmp/src/main/assembly/notification-snmp.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-snmp/src/main/resources/pkg_proto.py b/appserver/packager/notification-snmp/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..445a3ef2e39 --- /dev/null +++ b/appserver/packager/notification-snmp/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-snmp", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Notification SNMP Integration", + "pkg.description" : "Notification SNMP module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification-xmpp/pom.xml b/appserver/packager/notification-xmpp/pom.xml new file mode 100644 index 00000000000..e16b9cbf28d --- /dev/null +++ b/appserver/packager/notification-xmpp/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + + org.glassfish.main.packager + packages + 4.1.1.172-SNAPSHOT + + notification-xmpp + XMPP Notification Package + distribution-fragment + This pom describes how to assemble the XMPP Notification package + + + ${project.build.directory}/dependency + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + process-step1 + + + process-step2 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + process-step3 + + + + + + + + ips + + false + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-step4 + + + + + org.glassfish.build + glassfishbuild-maven-plugin + + + process-step5 + + exec + + + + + + maven-resources-plugin + + + copy-resources + + + + + + + + + + + fish.payara.admingui + xmpp-notifier-console-plugin + ${project.version} + true + + + fish.payara.appserver + notification-xmpp-core + ${project.version} + + + org.igniterealtime.smack + smack-core + ${smack.version} + + + org.igniterealtime.smack + smack-java7 + ${smack.version} + + + org.igniterealtime.smack + smack-tcp + ${smack.version} + + + xpp3 + xpp3 + + + + + org.igniterealtime.smack + smack-extensions + ${smack.version} + + + org.igniterealtime.smack + smack-im + ${smack.version} + + + org.jxmpp + jxmpp-core + ${jxmpp.version} + + + org.jxmpp + jxmpp-util-cache + ${jxmpp.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.xpp3 + ${xpp3.version} + + + + diff --git a/appserver/packager/notification-xmpp/src/main/assembly/notification-xmpp.xml b/appserver/packager/notification-xmpp/src/main/assembly/notification-xmpp.xml new file mode 100644 index 00000000000..a818075c979 --- /dev/null +++ b/appserver/packager/notification-xmpp/src/main/assembly/notification-xmpp.xml @@ -0,0 +1,66 @@ + + + + + stage-package + + dir + + + false + + + ${temp.dir}/nucleus + ${install.dir.name}/glassfish + + + ${temp.dir} + + nucleus/** + pkg_proto.py + + ${install.dir.name} + + + diff --git a/appserver/packager/notification-xmpp/src/main/resources/pkg_proto.py b/appserver/packager/notification-xmpp/src/main/resources/pkg_proto.py new file mode 100644 index 00000000000..8ced52805d0 --- /dev/null +++ b/appserver/packager/notification-xmpp/src/main/resources/pkg_proto.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common Development + # and Distribution License("CDDL") (collectively, the "License"). You + # may not use this file except in compliance with the License. You can + # obtain a copy of the License at + # https://github.com/payara/Payara/blob/master/LICENSE.txt + # See the License for the specific + # language governing permissions and limitations under the License. + # + # When distributing the software, include this License Header Notice in each + # file and include the License file at glassfish/legal/LICENSE.txt. + # + # GPL Classpath Exception: + # The Payara Foundation designates this particular file as subject to the "Classpath" + # exception as provided by the Payara Foundation in the GPL Version 2 section of the License + # file that accompanied this code. + # + # Modifications: + # If applicable, add the following below the License Header, with the fields + # enclosed by brackets [] replaced by your own identifying information: + # "Portions Copyright [year] [name of copyright owner]" + # + # Contributor(s): + # If you wish your version of this file to be governed by only the CDDL or + # only the GPL Version 2, indicate your decision by adding "[Contributor] + # elects to include this software in this distribution under the [CDDL or GPL + # Version 2] license." If you don't indicate a single choice of license, a + # recipient has the option to distribute your version of this file under + # either the CDDL, the GPL Version 2 or to extend the choice of license to + # its licensees as provided above. However, if you add GPL Version 2 code + # and therefore, elected the GPL Version 2 license, then the option applies + # only if the new code is made subject to such option by the copyright + # holder. + +import imp + +conf = imp.load_source("pkg_conf", "../pkg_conf.py") + +pkg = { + "name" : "notification-xmpp", + "version" : conf.notification_version, + "attributes" : { + "pkg.summary" : "Notification XMPP Integration", + "pkg.description" : "Notification XMPP module", + "info.classification" : "OSGi Service Platform Release 4", + }, + "dirtrees" : { "glassfish/modules" : {}, + }, + "licenses" : { + "../../../../ApacheLicense.txt" : {"license" : "ApacheV2"}, + } + } diff --git a/appserver/packager/notification/pom.xml b/appserver/packager/notification/pom.xml index 303a70ed585..dda51012032 100644 --- a/appserver/packager/notification/pom.xml +++ b/appserver/packager/notification/pom.xml @@ -105,49 +105,12 @@ zip true - - - fish.payara.admingui - slack-notifier-console-plugin - ${project.version} - true - - - fish.payara.admingui - hipchat-notifier-console-plugin - ${project.version} - true - fish.payara.admingui eventbus-notifier-console-plugin ${project.version} true - - fish.payara.admingui - email-notifier-console-plugin - ${project.version} - true - - - fish.payara.admingui - snmp-notifier-console-plugin - ${project.version} - true - - - fish.payara.admingui - xmpp-notifier-console-plugin - ${project.version} - true - - - fish.payara.admingui - jms-notifier-console-plugin - ${project.version} - true - diff --git a/appserver/packager/pom.xml b/appserver/packager/pom.xml index 26397399a24..f02d80a463a 100644 --- a/appserver/packager/pom.xml +++ b/appserver/packager/pom.xml @@ -166,6 +166,12 @@ asadmin-recorder JMX-Monitoring payara-micro + notification-email + notification-hipchat + notification-jms + notification-slack + notification-snmp + notification-xmpp diff --git a/appserver/payara-appserver-modules/pom.xml b/appserver/payara-appserver-modules/pom.xml index 1b36d45ba98..23fcaa6b839 100644 --- a/appserver/payara-appserver-modules/pom.xml +++ b/appserver/payara-appserver-modules/pom.xml @@ -42,6 +42,5 @@ notification-email-core notification-xmpp-core notification-snmp-core - notification-eventbus-core diff --git a/nucleus/packager/notification-package/pom.xml b/nucleus/packager/notification-package/pom.xml index 902d10ef00d..c8ef27cb3ab 100644 --- a/nucleus/packager/notification-package/pom.xml +++ b/nucleus/packager/notification-package/pom.xml @@ -59,88 +59,7 @@ ${project.version} - fish.payara.appserver - notification-jms-core - ${project.version} - - - fish.payara.appserver - notification-hipchat-core - ${project.version} - - - fish.payara.appserver - notification-slack-core - ${project.version} - - - fish.payara.appserver - notification-email-core - ${project.version} - - - fish.payara.appserver - notification-xmpp-core - ${project.version} - - - org.igniterealtime.smack - smack-core - ${smack.version} - - - org.igniterealtime.smack - smack-java7 - ${smack.version} - - - org.igniterealtime.smack - smack-tcp - ${smack.version} - - - xpp3 - xpp3 - - - - - org.igniterealtime.smack - smack-extensions - ${smack.version} - - - org.igniterealtime.smack - smack-im - ${smack.version} - - - org.jxmpp - jxmpp-core - ${jxmpp.version} - - - org.jxmpp - jxmpp-util-cache - ${jxmpp.version} - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.xpp3 - ${xpp3.version} - - - fish.payara.appserver - notification-snmp-core - ${project.version} - - - org.snmp4j - snmp4j - ${snmp4j.version} - - - fish.payara.appserver + fish.payara.nucleus notification-eventbus-core ${project.version} diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/pom.xml b/nucleus/payara-modules/notification-eventbus-core/pom.xml similarity index 94% rename from appserver/payara-appserver-modules/notification-eventbus-core/pom.xml rename to nucleus/payara-modules/notification-eventbus-core/pom.xml index 35852cb7469..ed38d078e4b 100644 --- a/appserver/payara-appserver-modules/notification-eventbus-core/pom.xml +++ b/nucleus/payara-modules/notification-eventbus-core/pom.xml @@ -39,11 +39,11 @@ 4.0.0 - org.glassfish.main - payara-appserver-modules + fish.payara.payara-modules + payara-nucleus-modules 4.1.1.171.1 - fish.payara.appserver + fish.payara.nucleus notification-eventbus-core glassfish-jar Eventbus Notification Implementation @@ -68,4 +68,4 @@ provided - \ No newline at end of file + diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessage.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessage.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessage.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessage.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessageQueue.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessageQueue.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessageQueue.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusMessageQueue.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationConfigurer.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationConfigurer.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationConfigurer.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationConfigurer.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEvent.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEvent.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEvent.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEvent.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEventFactory.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEventFactory.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEventFactory.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotificationEventFactory.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfiguration.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfiguration.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfiguration.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfiguration.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptions.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptions.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptions.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptions.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptionsFactory.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptionsFactory.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptionsFactory.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierConfigurationExecutionOptionsFactory.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptions.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptions.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptions.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptions.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptionsFactory.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptionsFactory.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptionsFactory.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierExecutionOptionsFactory.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierService.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierService.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierService.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/EventbusNotifierService.java diff --git a/appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/GetEventbusNotifierConfiguration.java b/nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/GetEventbusNotifierConfiguration.java similarity index 100% rename from appserver/payara-appserver-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/GetEventbusNotifierConfiguration.java rename to nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/GetEventbusNotifierConfiguration.java diff --git a/nucleus/payara-modules/pom.xml b/nucleus/payara-modules/pom.xml index 6c068db2d5c..f892346d075 100755 --- a/nucleus/payara-modules/pom.xml +++ b/nucleus/payara-modules/pom.xml @@ -37,5 +37,6 @@ notification-core asadmin-recorder service-exemplar + notification-eventbus-core