payara · smillidge · Jan 23, 2016 · Jan 21, 2016
diff --git a/appserver/admingui/common/src/main/resources/commonTaskDoc.inc b/appserver/admingui/common/src/main/resources/commonTaskDoc.inc
@@ -40,6 +40,8 @@
 
 -->
 
+<!-- Portions Copyright [2015-2016] [C2B2 Consulting Limited] -->
+
 <!-- common/commonTaskDoc.inc -->
 
 <sun:commonTasksGroup title="$resource{i18n.commonTasks.group.payara.docs}">

diff --git a/appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties b/appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties
@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2015] [C2B2 Consulting Limited]
+# Portions Copyright [2015-2016] [C2B2 Consulting Limited]
 TODO=
 TBD=TBD
 versionImage.description=Payara Server Administration Console 
@@ -331,7 +331,7 @@ msg.compareDate=Enter a Valid Date to generate diagnostic report. The date can b
 msg.upgradeSuccess=Successfully upgraded to cluster profile.
 
 # begin Common Tasks keys
-commonTasks.title=Payara Console - Common Tasks
+commonTasks.title=Payara Server Console - Common Tasks
 
 #it is on purpose to leave this blank so that Woodstock will not supply a default one that doesn't apply.
 commonTasks.help=

diff --git a/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml b/appserver/admingui/core/src/main/resources/templates/baseLayout.xhtml
@@ -40,6 +40,8 @@
 
 -->
 
+<!-- Portions Copyright [2016] [C2B2 Consulting Limited] -->
+
 <ui:event type="initPage">
     setResourceBundle(key="i18n" bundle="org.glassfish.admingui.core.Strings");
     getPluginIdFromViewId(viewId="#{facesContext.viewRoot.viewId}", pluginId="#{pluginId}");
@@ -89,8 +91,8 @@
             <f:verbatim>
             <style type="text/css">
                 .yui-skin-sam .yui-layout .yui-layout-unit-center div.yui-layout-bd {background-color: #FFF;}
-                .yui-layout-unit-top .yui-layout-bd { background-color: #5b87a4; }
-                .yui-skin-sam .yui-layout .yui-layout-unit-top div.yui-layout-bd { background-color: #5b87a4; }
+                .yui-layout-unit-top .yui-layout-bd { background-color: #325764; }
+                .yui-skin-sam .yui-layout .yui-layout-unit-top div.yui-layout-bd { background-color: #325764; }
                 .yui-layout-hd h2 {background-position:center; background-image:url(#{request.contextPath}/theme/com/sun/webui/jsf/suntheme/images/masthead/masthead-background.jpg);}
                 .yui-skin-sam .yui-layout { background-color: #ffffff;}
                 .yui-skin-sam .yui-layout .yui-layout-clip { background-color:#FFFFFF;}

diff --git a/.../admingui/payara-theme/src/main/resources/images/masthead-product_name_open.png b/.../admingui/payara-theme/src/main/resources/images/masthead-product_name_open.png
diff --git a/appserver/admingui/war/src/main/webapp/WEB-INF/sun-web.xml b/appserver/admingui/war/src/main/webapp/WEB-INF/sun-web.xml
@@ -38,7 +38,7 @@
     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.
-    Portions Copyright [2015] [C2B2 Consuting Limited]
+    Portions Copyright [2015-2016] [C2B2 Consuting Limited]
 -->
 
 <!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Servlet 2.3//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_3-0.dtd'>
@@ -61,6 +61,6 @@
 	<parameter-encoding default-charset="UTF-8" />
  </locale-charset-info>
 
-<class-loader delegate="true" extra-class-path="WEB-INF/extra/webui-jsf-suntheme-4.0.2.10.jar:WEB-INF/extra/dojo-ajax-nodemo-0.4.1.jar:WEB-INF/extra/webui-jsf-4.0.2.10.jar:WEB-INF/extra/commons-fileupload-1.3.1.jar:WEB-INF/extra/commons-io-1.3.1.jar:WEB-INF/extra/json-1.0.jar:WEB-INF/extra/prototype-1.5.0.jar" /> 
+<class-loader delegate="true" extra-class-path="WEB-INF/extra/webui-jsf-suntheme-4.0.2.10-payara-p1.jar:WEB-INF/extra/dojo-ajax-nodemo-0.4.1.jar:WEB-INF/extra/webui-jsf-4.0.2.10-payara-p1.jar:WEB-INF/extra/commons-fileupload-1.3.1.jar:WEB-INF/extra/commons-io-1.3.1.jar:WEB-INF/extra/json-1.0.jar:WEB-INF/extra/prototype-1.5.0.jar" /> 
 
 </sun-web-app>
diff --git a/appserver/admingui/war/src/main/webapp/resources/yui/assets/skins/sam/layout.css b/appserver/admingui/war/src/main/webapp/resources/yui/assets/skins/sam/layout.css
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -68,7 +68,7 @@
         <jstl-api.version>1.2.1</jstl-api.version>
         <mojarra.version>2.2.12</mojarra.version>
         <jsf-ext.version>0.2</jsf-ext.version>
-        <woodstock.version>4.0.2.10</woodstock.version>
+        <woodstock.version>4.0.2.10-payara-p1</woodstock.version>
         <javax.ejb-api.version>3.2</javax.ejb-api.version>
         <javax.interceptor-api.version>1.2</javax.interceptor-api.version>
         <javax.xml.rpc-api.version>1.1.1</javax.xml.rpc-api.version>

diff --git a/nucleus/pom.xml b/nucleus/pom.xml
@@ -166,7 +166,7 @@
         <pluginRepository>
            <id>payara-patched-externals</id>
 	   <name>Payara Patched Externals</name>
-	   <url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
+	     <url>https://raw.github.com/payara/Payara_PatchedProjects/master</url>
 	   <!--<url>file:///opt/PayaraDev/Payara_PatchedProjects</url> -->
            	<releases>
            		<enabled>true</enabled>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,8 @@ @@
     -->
+    <!-- Portions Copyright [2015-2016] [C2B2 Consulting Limited] -->
     <!-- common/commonTaskDoc.inc -->
     <sun:commonTasksGroup title="$resource{i18n.commonTasks.group.payara.docs}">
@@ Expand Down @@