Bug 1035324 Change Product name to JBoss Portal in Quickstarts

jboss-developer · Nov 28, 2013 · 2ff2988 · 2ff2988
1 parent 8995312
commit 2ff2988
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 34 deletions.
diff --git a/gatein-portal-extension/config/src/main/resources/conf/configuration.xml b/gatein-portal-extension/config/src/main/resources/conf/configuration.xml
@@ -33,7 +33,7 @@
                     <name>portal</name>
                     <object type="org.exoplatform.container.definition.PortalContainerDefinition">
                         <!-- The name of the Portal Container: note that a Portal Container called "portal"
-                             already exists in the default JPP installation. Therefore, we actually redefine
+                             already exists in the default GateIn installation. Therefore, we actually redefine
                              that existing Portal Container here. -->
                         <field name="name">
                             <string>portal</string>

diff --git a/...tal-extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml b/...tal-extension/war/src/main/webapp/WEB-INF/conf/sample-ext/common/common-configuration.xml
@@ -37,15 +37,15 @@
                     <!--
                         Note that we actually do not need to name locale.navigation.portal.classic and
                         locale.navigation.group.platform.administrators here as they are in init.resources
-                        of the default JPP installation. But it makes no harm to include them once again here.
+                        of the default Portal installation. But it makes no harm to include them once again here.
                     -->
                     <value>locale.navigation.portal.classic</value>
                     <value>locale.navigation.group.platform.administrators</value>
                 </values-param>
                 <values-param>
                     <name>portal.resource.names</name>
                     <description>These resources are merged to a single resource bundle which is accessible from anywhere
-                        in JPP. All these keys are located in the same bundle, which is separated from the navigation
+                        in the Portal. All these keys are located in the same bundle, which is separated from the navigation
                         resource bundles.</description>
                     <value>locale.portal.extension</value>
                 </values-param>

diff --git a/gatein-portal-extension/war/src/main/webapp/WEB-INF/gatein-resources.xml b/gatein-portal-extension/war/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -33,7 +33,7 @@
         <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css</css-path>
     </portlet-skin>
 
-    <!-- JPP will load this CSS for HomePagePortlet instead of the default one. -->
+    <!-- JBoss Portal will load this CSS for HomePagePortlet instead of the default one. -->
     <portlet-skin>
         <!--
             The name of the web application containing the portlet.xml file in which
@@ -44,7 +44,7 @@
         <!-- <portlet-name> value from the portlet.xml referenced above -->
         <portlet-name>HomePagePortlet</portlet-name>
         <skin-name>JppSkin</skin-name>
-        <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet-JPP.css</css-path>
+        <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet-jboss-portal.css</css-path>
     </portlet-skin>
 
     <!--
@@ -59,14 +59,14 @@
     </portlet-skin>
 
     <!--
-        JPP will load this CSS for BannerPortlet instead of the default one.
+        JBoss Portal will load this CSS for BannerPortlet instead of the default one.
         We want to replace the default logo with ours.
     -->
     <portlet-skin>
         <application-name>web</application-name>
         <portlet-name>BannerPortlet</portlet-name>
         <skin-name>JppSkin</skin-name>
-        <css-path>/templates/skin/webui/component/UIBannerPortlet/DefaultStylesheet-JPP.css</css-path>
+        <css-path>/templates/skin/webui/component/UIBannerPortlet/DefaultStylesheet-jboss-portal.css</css-path>
     </portlet-skin>
 
 

diff --git a/...al-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl b/...al-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
@@ -254,9 +254,9 @@ public static class LinksAndVersions {
     public static final String compatibility_portal_community_versionMinor = "6";
     public static final String compatibility_portal_community_versionMm = "3.6";
     public static final String compatibility_portal_community_versionMmm = "3.6.0";
-    public static final String compatibility_portal_product_projectName = "JBoss Portal Platform";
-    public static final String compatibility_portal_product_projectNameAndVersion = "JBoss Portal Platform 6.1";
-    public static final String compatibility_portal_product_projectNameShort = "JPP";
+    public static final String compatibility_portal_product_projectName = "Red Hat JBoss Portal";
+    public static final String compatibility_portal_product_projectNameAndVersion = "Red Hat JBoss Portal 6.1";
+    public static final String compatibility_portal_product_projectNameShort = "JBoss Portal";
     public static final String compatibility_portal_product_versionMajor = "6";
     public static final String compatibility_portal_product_versionMicro = "0";
     public static final String compatibility_portal_product_versionMinor = "1";

diff --git a/...ultSkin/background/JPP-extension-logo.gif → ...ackground/jboss-portal-extension-logo.gif b/...ultSkin/background/JPP-extension-logo.gif → ...ackground/jboss-portal-extension-logo.gif
diff --git a/...UIBannerPortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css b/...UIBannerPortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css
@@ -35,8 +35,8 @@
 }
 
 .UIBannerPortlet .RightBanner {
-    background: url('DefaultSkin/background/JPP-extension-logo.gif') no-repeat 13px 22px; /* orientation=lt */
-    background: url('DefaultSkin/background/JPP-extension-logo.gif') no-repeat right 22px; /* orientation=rt */
+    background: url('DefaultSkin/background/jboss-portal-extension-logo.gif') no-repeat 13px 22px; /* orientation=lt */
+    background: url('DefaultSkin/background/jboss-portal-extension-logo.gif') no-repeat right 22px; /* orientation=rt */
 }
 
 .UIBannerPortlet .MiddleBanner {

diff --git a/.../DefaultSkin/background/RightHome-JPP.jpg → ...kin/background/RightHome-jboss-portal.jpg b/.../DefaultSkin/background/RightHome-JPP.jpg → ...kin/background/RightHome-jboss-portal.jpg
diff --git a/...HomePagePortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css b/...HomePagePortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css
@@ -88,7 +88,7 @@
 }
 
 .UIHomePagePortlet .AdImageLeft {
-    background: url('DefaultSkin/background/RightHome-JPP.jpg') no-repeat left top;
+    background: url('DefaultSkin/background/RightHome-jboss-portal.jpg') no-repeat left top;
 }
 
 * html .UIHomePagePortlet .AdImageLeft {

diff --git a/gatein-sample-portal/war/src/main/webapp/WEB-INF/gatein-resources.xml b/gatein-sample-portal/war/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -43,7 +43,7 @@
         <!-- <portlet-name> value from the portlet.xml referenced above -->
         <portlet-name>HomePagePortlet</portlet-name>
         <skin-name>JppSkin</skin-name>
-        <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet-JPP.css</css-path>
+        <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet-jboss-portal.css</css-path>
     </portlet-skin>
 
 
@@ -59,14 +59,14 @@
     </portlet-skin>
 
     <!--
-        JPP will load this CSS for BannerPortlet instead of the default one.
+        JBoss Portal will load this CSS for BannerPortlet instead of the default one.
         We want to replace the default logo with ours.
     -->
     <portlet-skin>
         <application-name>web</application-name>
         <portlet-name>BannerPortlet</portlet-name>
         <skin-name>JppSkin</skin-name>
-        <css-path>/templates/skin/webui/component/UIBannerPortlet/DefaultStylesheet-JPP.css</css-path>
+        <css-path>/templates/skin/webui/component/UIBannerPortlet/DefaultStylesheet-jboss-portal.css</css-path>
     </portlet-skin>
 
 

diff --git a/...ample-portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl b/...ample-portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
@@ -154,9 +154,9 @@ public static class LinksAndVersions {
     public static final String compatibility_portal_community_versionMinor = "6";
     public static final String compatibility_portal_community_versionMm = "3.6";
     public static final String compatibility_portal_community_versionMmm = "3.6.0";
-    public static final String compatibility_portal_product_projectName = "JBoss Portal Platform";
-    public static final String compatibility_portal_product_projectNameAndVersion = "JBoss Portal Platform 6.1";
-    public static final String compatibility_portal_product_projectNameShort = "JPP";
+    public static final String compatibility_portal_product_projectName = "Red Hat JBoss Portal";
+    public static final String compatibility_portal_product_projectNameAndVersion = "Red Hat JBoss Portal 6.1";
+    public static final String compatibility_portal_product_projectNameShort = "JBoss Portal";
     public static final String compatibility_portal_product_versionMajor = "6";
     public static final String compatibility_portal_product_versionMicro = "0";
     public static final String compatibility_portal_product_versionMinor = "1";

diff --git a/...kin/background/JPP-sample-portal-logo.gif → ...round/jboss-portal-sample-portal-logo.gif b/...kin/background/JPP-sample-portal-logo.gif → ...round/jboss-portal-sample-portal-logo.gif
diff --git a/...UIBannerPortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css b/...UIBannerPortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css
@@ -34,8 +34,8 @@
 }
 
 .UIBannerPortlet .RightBanner {
-    background: url('DefaultSkin/background/JPP-sample-portal-logo.gif') no-repeat 13px 22px; /* orientation=lt */
-    background: url('DefaultSkin/background/JPP-extension-logo.gif') no-repeat right 22px; /* orientation=rt */
+    background: url('DefaultSkin/background/jboss-portal-sample-portal-logo.gif') no-repeat 13px 22px; /* orientation=lt */
+    background: url('DefaultSkin/background/jboss-portal-extension-logo.gif') no-repeat right 22px; /* orientation=rt */
 }
 
 .UIBannerPortlet .MiddleBanner {

diff --git a/.../DefaultSkin/background/RightHome-JPP.jpg → ...kin/background/RightHome-jboss-portal.jpg b/.../DefaultSkin/background/RightHome-JPP.jpg → ...kin/background/RightHome-jboss-portal.jpg
diff --git a/...HomePagePortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css b/...HomePagePortlet/DefaultStylesheet-JPP.css → ...ortlet/DefaultStylesheet-jboss-portal.css
@@ -88,7 +88,7 @@
 }
 
 .UIHomePagePortlet .AdImageLeft {
-    background: url('DefaultSkin/background/RightHome-JPP.jpg') no-repeat left top;
+    background: url('DefaultSkin/background/RightHome-jboss-portal.jpg') no-repeat left top;
     height: 148px;
 }
 

diff --git a/howto-release.adoc b/howto-release.adoc
@@ -53,13 +53,13 @@ total 3248
 -rw-rw-r--. 1 ppalaga ppalaga   81222 May 14 15:35 social-portlets.zip
 
 # in most cases, you want to publish the *-Quickstarts.zip file (which contains all quickstarts)
-# separately under GateIn/JPP Downloads
+# separately under GateIn/JBoss Portal Downloads
 mv -t /tmp *-Quickstarts.zip
 # the remainig files belong to download.jboss.org/gatein/quickstarts/[jpp|gatein]-[major].[minor] folder
 rsync * ...
 ----
 
-. Upload the `*-Quickstarts.zip` file to GateIn/JPP Downloads:
+. Upload the `*-Quickstarts.zip` file to GateIn/JBoss Portal Downloads:
 +
 [source,sh]
 ----

diff --git a/navigation-api-portlet/src/main/webapp/WEB-INF/gatein-resources.xml b/navigation-api-portlet/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -56,7 +56,7 @@
         <css-path>/css/QuickstartStylesheet.css</css-path>
     </portlet-skin>
 
-    <!-- Skin definition for JPP -->
+    <!-- Skin definition for JBoss Portal -->
     <portlet-skin>
         <application-name>navigation-api-portlet</application-name>
         <portlet-name>QuickstartNavigationPortlet</portlet-name>

diff --git a/pom.xml b/pom.xml
@@ -75,8 +75,8 @@
         <compatibility.portal.product.versionMicro>0</compatibility.portal.product.versionMicro>
         <compatibility.portal.product.versionMm>${compatibility.portal.product.versionMajor}.${compatibility.portal.product.versionMinor}</compatibility.portal.product.versionMm>
         <compatibility.portal.product.versionMmm>${compatibility.portal.product.versionMm}.${compatibility.portal.product.versionMicro}</compatibility.portal.product.versionMmm>
-        <compatibility.portal.product.projectName>JBoss Portal Platform</compatibility.portal.product.projectName>
-        <compatibility.portal.product.projectNameShort>JPP</compatibility.portal.product.projectNameShort>
+        <compatibility.portal.product.projectName>Red Hat JBoss Portal</compatibility.portal.product.projectName>
+        <compatibility.portal.product.projectNameShort>JBoss Portal</compatibility.portal.product.projectNameShort>
         <compatibility.portal.product.projectNameAndVersion>${compatibility.portal.product.projectName} ${compatibility.portal.product.versionMm}</compatibility.portal.product.projectNameAndVersion>
 
         <compatibility.portal.versionMajor>${compatibility.portal.community.versionMajor}</compatibility.portal.versionMajor>

diff --git a/settings-zipped-repos.xml b/settings-zipped-repos.xml
@@ -33,9 +33,9 @@
       <id>jboss-local-repositories</id>
       <repositories>
         <repository>
-          <id>jpp</id>
-          <!-- Change this to where you have unpacked the zipped JPP 6.1.0 Maven repository -->
-          <url>file:///path/to/repo/jboss-jpp-6.1.0-maven-repository</url>
+          <id>jboss-portal</id>
+          <!-- Change this to where you have unpacked the zipped JBoss Portal 6.1.0 Maven repository -->
+          <url>file:///path/to/repo/jboss-portal-6.1.0-maven-repository</url>
           <releases>
             <enabled>true</enabled>
           </releases>
@@ -136,9 +136,9 @@
 
       <pluginRepositories>
         <pluginRepository>
-          <id>jpp-plugins</id>
-          <!-- Change this to where you have unpacked the zipped JPP Maven repository -->
-          <url>file:///path/to/repo/jboss-jpp-6.1.0-maven-repository</url>
+          <id>jboss-portal-plugins</id>
+          <!-- Change this to where you have unpacked the zipped JBoss Portal Maven repository -->
+          <url>file:///path/to/repo/jboss-portal-6.1.0-maven-repository</url>
           <releases>
             <enabled>true</enabled>
           </releases>

diff --git a/...n/freemarker/gatein-portal-extension/config/src/main/resources/conf/configuration.xml.ftl b/...n/freemarker/gatein-portal-extension/config/src/main/resources/conf/configuration.xml.ftl
@@ -33,7 +33,7 @@
                     <name>portal</name>
                     <object type="org.exoplatform.container.definition.PortalContainerDefinition">
                         <!-- The name of the Portal Container: note that a Portal Container called "portal"
-                             already exists in the default JPP installation. Therefore, we actually redefine
+                             already exists in the default ${compatibility.portal.projectNameShort} installation. Therefore, we actually redefine
                              that existing Portal Container here. -->
                         <field name="name">
                             <string>portal</string>