Skip to content

Commit

Permalink
PAYARA-1480 split out individual notifiers into individual packages (#…
Browse files Browse the repository at this point in the history
…1412)

Moved event bus to nucleus as it only depends on nucleus
Modified feature sets to include correct notifiers
  • Loading branch information
smillidge authored and Pandrex247 committed Mar 27, 2017
1 parent fb58a31 commit ca394d3
Show file tree
Hide file tree
Showing 40 changed files with 1,532 additions and 143 deletions.
12 changes: 2 additions & 10 deletions appserver/extras/payara-micro/payara-micro-distribution/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,11 @@
<delete file="${runtimedir}/shoal-gms-api.jar"/>
<delete file="${runtimedir}/load-balancer-admin.jar"/>
<delete file="${runtimedir}/gf-load-balancer-connector.jar"/>
<delete file="${runtimedir}/notification-jms-core.jar"/>
<delete file="${runtimedir}/notification-email-core.jar"/>
<delete file="${runtimedir}/notification-hipchat-core.jar"/>
<delete file="${runtimedir}/notification-slack-core.jar"/>
<delete file="${runtimedir}/notification-snmp-core.jar"/>
<delete file="${runtimedir}/notification-xmpp-core.jar"/>
<delete file="${runtimedir}/notification-xmpp-core.jar"/>
<delete file="${runtimedir}/org.apache.servicemix.bundles.xpp3.jar"/>
<delete file="${runtimedir}/eventbus-notifier-console-plugin"/>
<delete file="${runtimedir}/backup.jar"/>
<delete file="${runtimedir}/ant.jar" failonerror="false"/>
<delete verbose="true" failonerror="false">
<fileset dir="${runtimedir}" includes="**console-plugin.jar"/>
<fileset dir="${runtimedir}" includes="console-**-help.jar"/>
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
Expand All @@ -129,8 +123,6 @@
<fileset dir="${runtimedir}" includes="**/weld-se-core.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-environment-common.jar"/>
<fileset dir="${runtimedir}" includes="**/derbyLocale*.jar"/>
<fileset dir="${runtimedir}" includes="**/jxmpp*.jar"/>
<fileset dir="${runtimedir}" includes="**/smack*.jar"/>
</delete>
<delete file="${runtimedir}/autostart/osgi-cdi.jar" failonerror="false"/>
</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,9 @@
<delete file="${runtimedir}/backup.jar"/>
<delete file="${runtimedir}/payara-domain.jar"/>
<delete file="${runtimedir}/ant.jar" failonerror="false"/>
<delete file="${runtimedir}/notification-jms-core.jar"/>
<delete file="${runtimedir}/notification-email-core.jar"/>
<delete file="${runtimedir}/notification-hipchat-core.jar"/>
<delete file="${runtimedir}/notification-slack-core.jar"/>
<delete file="${runtimedir}/notification-snmp-core.jar"/>
<delete file="${runtimedir}/notification-xmpp-core.jar"/>
<delete file="${runtimedir}/notification-xmpp-core.jar"/>
<delete file="${runtimedir}/org.apache.servicemix.bundles.xpp3.jar"/>
<delete verbose="true" failonerror="false">
<fileset dir="${runtimedir}" includes="console-**-help.jar"/>
<fileset dir="${runtimedir}" includes="**console-plugin.jar"/>
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
<fileset dir="${runtimedir}" includes="**/appserver-domain.jar"/>
Expand Down
31 changes: 31 additions & 0 deletions appserver/featuresets/payara-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,43 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<!-- Notifiers -->
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-email</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-hipchat</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-slack</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-snmp</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-xmpp</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>asadmin-recorder</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions appserver/featuresets/payara/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<!-- JMS Notifier -->
<dependency>
<groupId>org.glassfish.main.packager</groupId>
<artifactId>notification-jms</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
</dependencies>
</project>
113 changes: 113 additions & 0 deletions appserver/packager/notification-email/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (c) 2016 Payara Foundation. All rights reserved.
*
* The contents of this file are subject to the terms of 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://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
* or packager/legal/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 packager/legal/LICENSE.txt.
-->
<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.glassfish.main.packager</groupId>
<artifactId>packages</artifactId>
<version>4.1.1.172-SNAPSHOT</version>
</parent>
<artifactId>notification-email</artifactId>
<name>eMail Notification Package</name>
<packaging>distribution-fragment</packaging>
<description>This pom describes how to assemble the eMail Notification package</description>

<properties>
<temp.dir>${project.build.directory}/dependency</temp.dir>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>process-step1</id>
</execution>
<execution>
<id>process-step2</id>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>process-step3</id>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ips</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>process-step4</id>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>glassfishbuild-maven-plugin</artifactId>
<executions>
<execution>
<id>process-step5</id>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>fish.payara.appserver</groupId>
<artifactId>notification-email-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>fish.payara.admingui</groupId>
<artifactId>email-notifier-console-plugin</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
</project>

Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="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.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">

<id>stage-package</id>
<formats>
<format>dir</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${temp.dir}/nucleus</directory>
<outputDirectory>${install.dir.name}/glassfish</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}</directory>
<excludes>
<exclude>nucleus/**</exclude>
<exclude>pkg_proto.py</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
Original file line number Diff line number Diff line change
@@ -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"},
}
}
Loading

0 comments on commit ca394d3

Please sign in to comment.