Merge pull request #146 from dolfdijkstra/site-logo

Added logo to site. Added release instructions to package.sh
dolfdijkstra · Mar 13, 2017 · 9d3dce7 · 9d3dce7
2 parents fef3c6a + 7690627
commit 9d3dce7
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 27 deletions.
diff --git a/package.sh b/package.sh
@@ -166,8 +166,8 @@ then
 	mkdir $tmpBase
 fi
 
-if [ ! -d $HOME/.m2/repository/com/fatwire/gst/gst-foundation ] ;
-then 
+if [ ! -d $HOME/.m2/repository/com/fatwire/gst/gst-foundation -o ! -d $HOME/.m2/repository/tools/gsf ] ;
+then
    echo "[$(date)] The GSF artifacts are not present in your maven repository. This is expected if you are building for the first time on this computer."
    echo "[$(date)] Starting initial build"
    echo
@@ -246,3 +246,23 @@ esac
 # sed -i  's/<david.chesebro@metastratus.com>//g' /tmp/git-log 
 # vi src/site/apt/changes-11g.apt 
 
+# Site Update instructions (tested for version 12.0.1 on Oct 24, 2016 by Tony Field)
+# - update poms to new release version for all modules (gst-foundation, gsf-build-tools, gsf-core, gsf-legacy)
+# - update site.xml to link to new "previous version" site
+# - update the download.apt.vm page to link to the new download and update prior versions
+# - update documentation as needed
+# - run this script to build the package (sh package.sh)
+# - validate build
+# - commit poms & site
+# - issue pull request into version trunk (e.g. gst-foundation-12)
+# - save full site zip from target folder
+# - checkout gh-pages branch
+# - add new folder to releases directory for new version (e.g. gsf-12.0.1)
+# - extract full site zip from gh-pages branch
+# - place content from teh site folder into the release folder in the gh-pages checkout
+# - edit index.html to redirect users to the new version (i.e. update the meta refresh tag)
+# - commit the gh-pages changes
+# - verify the site - navigate to gst-foundation.org and you should be directed to the new version
+# - if your release is the latest major version, (i.e. 12 not 11 or 1) then issue a pull request to pull your changes from the version trunk into the master branch, so that the master branch remains the most stable release
+# - checkout the version branch again
+# - update the pom files to reflect the next minor/patch version's snapshot label (e.g. 12.0.2-SNAPSHOT)
diff --git a/src/site/resources/images/GSF-logo-350x100.png b/src/site/resources/images/GSF-logo-350x100.png
diff --git a/src/site/resources/images/GSF-logo-GST-592x100.png b/src/site/resources/images/GSF-logo-GST-592x100.png
diff --git a/src/site/resources/images/GSF-logo-GST-592x130.png b/src/site/resources/images/GSF-logo-GST-592x130.png
diff --git a/src/site/resources/images/GSF-logo-wcs-Stack250x100.png b/src/site/resources/images/GSF-logo-wcs-Stack250x100.png
diff --git a/src/site/resources/images/GSF-logo-wcs608x100.png b/src/site/resources/images/GSF-logo-wcs608x100.png
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -18,35 +18,19 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
+<project xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"
+         name="GST Site Foundation">
+    <bannerLeft>
+        <name>GST Site Foundation</name>
+        <src>images/GSF-logo-GST-592x130.png</src>
+        <href>index.html</href>
+    </bannerLeft>
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
         <version>1.5</version>
     </skin>
-    <custom>
-        <fluidoSkin>
-            <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-            <topBarEnabled>false</topBarEnabled>
-            <sideBarEnabled>true</sideBarEnabled>
-            <googleSearch>
-                <sitesearch/>
-            </googleSearch>
-            <facebookLike />
-        </fluidoSkin>
-        <head>
-            <script type="text/javascript">
-                var _gaq = _gaq || [];
-                _gaq.push(['_setAccount', 'UA-30024219-1']);
-                _gaq.push(['_trackPageview']);
-                (function() {
-                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                })();
-            </script>
-        </head>
-    </custom>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="./index.html"/>
@@ -69,7 +53,7 @@ under the License.
         </menu>
         <menu name="Development">
             <item name="Building" href="./dev/building.html"/>
-            <item name="Issue Tracking" href="./issue-tracking.html"/>
+            <item name="Issue Tracking" href="https://github.com/dolfdijkstra/gst-foundation/issues"/>
             <item name="Source Repository" href="./source-repository.html"/>
         </menu>
         <menu ref="modules" />
@@ -82,4 +66,24 @@ under the License.
             <item name="1.3" href="../gsf-1.3/gst-foundation-kit-1.3.tar" />
         </menu>
     </body>
+    <custom>
+        <fluidoSkin>
+            <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+            <topBarEnabled>true</topBarEnabled>
+            <sideBarEnabled>true</sideBarEnabled>
+            <facebookLike />
+        </fluidoSkin>
+        <head>
+            <script type="text/javascript">
+                var _gaq = _gaq || [];
+                _gaq.push(['_setAccount', 'UA-30024219-1']);
+                _gaq.push(['_trackPageview']);
+                (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+                })();
+            </script>
+        </head>
+    </custom>
 </project>