Merge pull request #1391 from Pandrex247/Payara-Blue-171-Release

Merge master and Increment Version Numbers

.gitignore

@@ -10,4 +10,5 @@ target/
 *.iml
 .idea
 gfbuild.log
-/nucleus/payara-modules/requesttracing-core/nbproject/
+/nucleus/payara-modules/requesttracing-core/nbproject/
+nb-configuration.xml

appserver/admin/admin-core/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>admin-core</artifactId>

appserver/admin/backup-l10n/pom.xml

@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

appserver/admin/backup/pom.xml

@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backup</artifactId>

appserver/admin/cli-optional-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>cli-optional-l10n</artifactId>

appserver/admin/cli-optional/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
     <artifactId>cli-optional</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admin/cli/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
     <artifactId>appserver-cli</artifactId>
     <packaging>glassfish-jar</packaging>

appserver/admin/gf_template/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
 
     <artifactId>appserver-domain</artifactId>

appserver/admin/gf_template/src/main/resources/config/domain.xml

@@ -40,6 +40,8 @@
 
 -->
 
+<!-- Portions Copyright [2017] [Payara Foundation and/or its affiliates] -->
+
 <domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
 <security-configurations>
     <authentication-service default="true" name="adminAuth" use-password-credential="true">
@@ -125,6 +127,7 @@
       <notification-service-configuration enabled="true">
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
+      <monitoring-service-configuration></monitoring-service-configuration>
        <diagnostic-service />
       <security-service>
         <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
@@ -378,6 +381,7 @@
       <notification-service-configuration enabled="true">
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
+      <monitoring-service-configuration></monitoring-service-configuration>
          <diagnostic-service />
          <java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
              <jvm-options>-server</jvm-options>

appserver/admin/payara_template/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
 
     <artifactId>payara-domain</artifactId>

appserver/admin/payara_template/src/main/resources/config/domain.xml

@@ -103,6 +103,7 @@
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
        <batch-runtime-configuration data-source-lookup-name="jdbc/__default"></batch-runtime-configuration>
+       <monitoring-service-configuration></monitoring-service-configuration>
        <diagnostic-service />
       <security-service activate-default-principal-to-role-mapping="true">
         <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
@@ -335,6 +336,7 @@
       <notification-service-configuration enabled="true">
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
+      <monitoring-service-configuration></monitoring-service-configuration>
          <diagnostic-service />
       <java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
         <jvm-options>-server</jvm-options>

appserver/admin/pom.xml

@@ -48,7 +48,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.glassfish.main.admin</groupId>

appserver/admingui/cluster-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-cluster-plugin-l10n</artifactId>

appserver/admingui/cluster/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-cluster-plugin</artifactId>

appserver/admingui/common-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/common-l10n/src/main/resources/org/glassfish/common/admingui/Strings_it.properties

@@ -535,7 +535,7 @@ msg.jvmOptionInvalid=L''opzione JVM {0} non \u00E8 valida perch\u00E9 non inizia
 #reg.pleaseReg=Effettuare la registrazione
 #reg.yourPrivacy=Privacy
 #reg.privacy=Sun Microsystems, Inc. tutela la privacy degli utenti. I dati personali raccolti in questo modulo non verranno condivisi con organizzazioni esterne a Sun senza il previo consenso dell'utente, tranne che per l'elaborazione dei dati per conto di Sun in relazione a questa transazione.
-#reg.privacy2=In caso di dubbi o domande, fare riferimento alle <a href="http://www.sun.com/privacy" target="_blank" >Norme sulla privacy di Sun</a> oppure contattare Sun all'indirizzo <a href="mailto:[email protected]">[email protected]</a>
+#reg.privacy2=In caso di dubbi o domande, fare riferimento alle <a href="http://www.sun.com/privacy" target="_blank" >Norme sulla privacy di Sun</a> oppure contattare Payara Support all'indirizzo <a href="mailto:[email protected]">[email protected]</a>
 #reg.agree=Facendo clic sul pulsante Registra, si accettano le <a href="http://www.sun.com/termsofuse.jsp" target="_blank">condizioni per l'utilizzo dell'account Sun Online.</a>
 #reg.error.noRegService=Impossibile creare il servizio di registrazione. Per informazioni sull'errore, consultare il log del server.
 

appserver/admingui/common/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-common</artifactId>

appserver/admingui/concurrent-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-concurrent-plugin-l10n</artifactId>

appserver/admingui/concurrent/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-concurrent-plugin</artifactId>

appserver/admingui/corba-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-corba-plugin-l10n</artifactId>

appserver/admingui/corba/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-corba-plugin</artifactId>

appserver/admingui/core-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-core-l10n</artifactId>

appserver/admingui/core/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-core</artifactId>

appserver/admingui/dataprovider/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

appserver/admingui/devtests/src/test/java/org/glassfish/admingui/devtests/BaseSeleniumTestClass.java

@@ -37,6 +37,8 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
+// Portions Copyright [2016] [Payara Foundation and/or its affiliates] 
+
 package org.glassfish.admingui.devtests;
 
 import com.google.common.base.Function;
@@ -1126,7 +1128,7 @@ public T get() {
                     value = operation();
                     success = true;
                 } catch (Exception e) {
-                    logger.log(Level.FINE, "Exception caught ('{0}'). Sleeping...", e.getMessage());
+                    logger.log(Level.FINE, "Exception caught (''{0}''). Sleeping...", e.getMessage());
                     count++;
                 }
             }

appserver/admingui/dist-fragment/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
     </parent>
 
     <artifactId>dist-fragment</artifactId>

appserver/admingui/ejb-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-ejb-plugin-l10n</artifactId>

appserver/admingui/ejb-lite-l10n/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-ejb-lite-plugin-l10n</artifactId>

appserver/admingui/ejb-lite/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-ejb-lite-plugin</artifactId>

appserver/admingui/ejb/pom.xml

@@ -46,7 +46,7 @@
     <parent>
         <groupId>fish.payara.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>4.1.1.171-SNAPSHOT</version>
+        <version>4.1.1.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>console-ejb-plugin</artifactId>

appserver/admingui/email-notifier-console-plugin/pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>admingui</artifactId>
+    <groupId>fish.payara.admingui</groupId>
+    <version>4.1.1.171</version>
+  </parent>
+
+  <groupId>fish.payara.admingui</groupId>
+  <artifactId>email-notifier-console-plugin</artifactId>
+  <packaging>glassfish-jar</packaging>
+  <version>4.1.1.171</version>
+
+  <name>Email Notifier Console Plugin</name>
+
+  <!-- FIXME change it to the project's website -->
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*.jar</exclude>
+                </excludes>
+            </resource>
+        </resources>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>fish.payara.admingui</groupId>
+            <artifactId>console-plugin-service</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>