Switching site publish to asf-staging branch

archiva-docs/checkoutSite.sh

@@ -42,6 +42,7 @@ CLONE=1
 FORCE=1
 MODULE_DIR="${MY_PWD}"
 PATTERN=""
+BRANCH="master"
 while [ ! -z "$1" ]; do
   case "$1" in
     -f) 
@@ -67,6 +68,11 @@ while [ ! -z "$1" ]; do
       MODULE_DIR="$1"
       shift
       ;;
+    -b)
+      shift
+      BRANCH="$1"
+      shift
+      ;;
     *)
       GIT_REMOTE="$1"
       shift
@@ -119,6 +125,8 @@ fi
 
 cd "${SITE_DIR}" || { echo "Could not change to site dir ${SITE_DIR}"; exit 1; }
 
+git checkout "${BRANCH}"
+
 git config core.sparsecheckout true
 git config user.name "${GIT_USER}"
 git config user.email "${GIT_EMAIL}"

archiva-docs/deploySite.sh

@@ -27,35 +27,41 @@
 THIS_DIR=$(dirname $0)
 THIS_DIR=$(readlink -f ${THIS_DIR})
 CONTENT_DIR=".site-content"
-
+BRANCH="asf-staging-3.0"
-PROJECT_VERSION=$(grep '<version>' pom.xml |head -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/g')
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-SUB_DIR="docs/${PROJECT_VERSION}"
+PUBLISH_PATH=$(mvn help:evaluate -Dexpression=scmPublishPath -q -DforceStdout)
+BRANCH=$(mvn help:evaluate -Dexpression=scmPublishBranch -q -DforceStdout)
+CONTENT_DIR=$(mvn help:evaluate -Dexpression=scmPubCheckoutDirectory -q -DforceStdout)
 
 if [ -d "${CONTENT_DIR}/.git" ]; then
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" checkout ${BRANCH}
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
 fi
 
 echo ">>>> Creating site and reports <<<<" 
-mvn clean site site:stage "$@"
+mvn clean site "$@"
+mvn site:stage "$@"
 
 echo "*****************************************"
 echo ">>>> Finished the site stage process <<<<"
 echo "> You can check the content in the folder target/staging or by opening the following url"
-echo "> file://${THIS_DIR}/target/staging/${SUB_DIR}/index.html"
+echo "> file://${THIS_DIR}/target/staging${PUBLISH_PATH}/index.html"
 echo "> "
 echo "> If everything is fine enter yes. After that the publish process will be started."
 echo -n "Do you want to publish (yes/no)? "
 read ANSWER
 
-if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" ]; then
+if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" -o "${ANSWER}" == "y" -o "${ANSWER}" == "Y" ]; then
   echo "> Starting publish process"
   mvn scm-publish:publish-scm "$@"
 else
   echo "> Aborting now"
   echo "> Running git reset in .site-content directory" 
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
   echo ">>>> Finished <<<<"
 fi
 

archiva-docs/pom.xml

@@ -36,6 +36,8 @@
     <!-- The git repository, where the site content is placed -->
     <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
     <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
+    <scmPublishBranch>asf-staging</scmPublishBranch>
+    <scmPublishPath>/docs/${project.version}</scmPublishPath>
   </properties>
 
   <build>
@@ -94,7 +96,7 @@
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <skipDeploy>true</skipDeploy>
-          <stagingDirectory>${project.build.directory}/staging/docs/${project.version}/</stagingDirectory>
+          <stagingDirectory>${project.build.directory}/staging${scmPublishPath}/</stagingDirectory>
         </configuration>
         <executions>
           <execution>
@@ -212,6 +214,8 @@
                   <arguments>
                     <argument>-d</argument>
                     <argument>${scmPubCheckoutDirectory}</argument>
+                    <argument>-b</argument>
+                    <argument>${scmPublishBranch}</argument>
                     <argument>${siteRepositoryUrl}</argument>
                   </arguments>
                 </configuration>

archiva-docs/src/site/resources/css/site.css

@@ -17,75 +17,91 @@
  * under the License.
  */
 
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+body {
-  background: none;
+  padding-top: 1px;
-  padding-right: 0;
 }
 
-body ul {
+a.externalLink[href^="https"] {
-  list-style-type: square;
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
 }
 
-#downloadbox {
+a.externalLink[href^="http"] {
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
+}
+
+#bodyColumn {
+  margin-left: 1.5em;
+}
+
+div#rhs {
   float: right;
-  margin-left: 2em;
+  text-align: center;
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-bottom: 1em;
-  border: 1px solid #999;
-  background-color: #eee;
-  width: 17.5em;
 }
 
-#downloadbox h5 {
+div.mainBox {
-  color: #000;
+  margin-left: auto;
-  margin: 0;
+  margin-right: auto;
-  border-bottom: 1px solid #aaaaaa;
-  font-size: smaller;
-  padding: 0;
   margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 5em;
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
 }
 
-#downloadbox p {
+div.mainBox div {
+  padding: 0.4em;
+}
+
+div.newsBox {
+  margin-left: auto;
+  margin-right: auto;
   margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 8em;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+div.newsBox div {
+  padding: 0.6em;
+}
+
+div.mainBox span + p a {
+  background: url(../images/arrow.png) no-repeat;
+  background-size: 16px 16px;
+  background-position: right;
+  padding-right: 20px;
+}
+
+div.mainBox span + p a {
+  font-size: 1.5em;
+  /*color: black;*/
+}
+
+div.mainBox span + p a:hover {
+  /*color: blue;*/
+}
+
+.bignumber {
+  position: absolute;
+  color: white;
+  left: 0.25em;
+  font-size: 1.9em;
+}
+
+div.linkBox p {
+  text-align: right;
   margin-bottom: 0;
-}
+  margin-top: 0;
-
+  padding-top: 0;
-#downloadbox li {
-  text-indent: inherit;
-}
-
-div.p {
-  margin-top: 5px;
-  margin-bottom: 10px;
-}
-
-pre.commandline {
-  border: 1px solid #bbb;
-  background-color: white;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  font-size: 10pt;
-  padding: 15px;
-  color: gray;
-}
-
-img {
-  border-style: solid ;
-  border-width: 1px;
-  border-color: #ddd;
-  padding: 5px;
-  margin-top: 10px;
-  border-radius: 5px;
-}
-
-pre.commandline .input {
-  color: #55f;
-}
-
-pre.commandline .command {
-  color: black;
-  font-weight: bold;
 }
 
 #banner {
@@ -93,7 +109,78 @@ pre.commandline .command {
 }
 
 #banner img {
-  margin: 2px;
+  margin: 10px;
+}
+
+div.jqmWindow h2, div.jqmWindow p {
+  text-align: center;
+}
+
+span.jqmClose {
+  position: absolute;
+  cursor: pointer;
+  right: 4px;
+  top: 6px;
 }
 
 
+div.section {
+  margin-right: 110px;
+  margin-left: 10px;
+}
+
+.hero-unit p {
+  /* font-weight: inherit;*/
+}
+
+.archivascreenshots {
+  border: 1px solid silver;
+  margin-left: 0.25em;
+  margin-bottom: 0.25em
+}
+
+.rhs span {
+  display: block;
+  font-size: 13px;
+  font-weight: bold;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+
+.container ul li iframe {
+  margin-top: 4px;
+  margin-right: 4px;
+}
+
+.modal-body table {
+  border: 0px;
+}
+
+
+.features-preview:after {
+  background-color: #F5F5F5;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 0 4px 0;
+  color: #9DA0A4;
+  content: "New web UI";
+  font-size: 12px;
+  font-weight: bold;
+  left: -1px;
+  padding: 3px 7px;
+  position: absolute;
+  top: -1px;
+
+}
+.features-preview {
+  background-color: #FFFFFF;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 4px 4px 4px;
+  margin: 15px 0;
+  padding: 39px 19px 14px;
+  position: relative;
+  min-height: 450px;
+}
+
+.carousel .item > img {
+  min-height: 400px;
+}

archiva-docs/src/site/site.xml

@@ -53,7 +53,7 @@
       <gitHub>
         <projectId>apache/archiva</projectId>
         <ribbonOrientation>right</ribbonOrientation>
-        <ribbonColor>black</ribbonColor>
+        <ribbonColor>gray</ribbonColor>
       </gitHub>
     </fluidoSkin>
 
@@ -66,7 +66,7 @@
 
     <breadcrumbs>
       <item name="Apache" href="https://www.apache.org" />
-      <item name="Archiva" href="https://archiva.apache.org" />
+      <item name="Archiva" href="https://archiva.apache.org/index.html" />
       <item name="Archiva Documentation" href="index.html" />
     </breadcrumbs>
 
@@ -74,7 +74,7 @@
       <item name="Quick Start"   href="/quick-start.html" />
       <item name="Feature Tour"  href="/tour/index.html" />
       <item name="Release Notes" href="/release-notes.html" />
-      <item name="Downloads"     href="http://archiva.apache.org/download.html" />
+      <item name="Downloads"     href="https://archiva.apache.org/download.html" />
     </menu>
 
     <menu name="Users Guide">
@@ -143,23 +143,33 @@
     </menu>
 
     <menu name="More Information">
-      <item name="Archiva Wiki"              href="http://cwiki.apache.org/confluence/display/ARCHIVA/Index" />
+      <item name="Archiva Wiki"              href="https://cwiki.apache.org/confluence/display/ARCHIVA/Index" />
     </menu>
 
     <menu name="ASF">
-      <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
+      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
-      <item name="Foundation" href="http://www.apache.org/foundation/"/>
+      <item name="Foundation" href="https://www.apache.org/foundation/"/>
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
-      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+      <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
     </menu>
     <footer>
       <![CDATA[
-      <div class="row span12">Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.</div>
+      <div class="row">
-      <div class="row span12">
+      <div class="span6 offset1">Apache Archiva, Archiva, Apache, the Apache feather logo, and the Apache Archiva project logos are trademarks of The Apache Software Foundation.</div>
+      </div>
+      <div class="row">
+        &nbsp;
+      </div>
+      <div class="row">
+      <div class="span6 offset2">
+      <p>
         <a href="${project.url}privacy-policy.html">Privacy Policy</a>
+        </p>
+      </div>
       </div>
       ]]>
     </footer>
 
+
   </body>
 </project>

archiva-modules/checkoutSite.sh

@@ -42,6 +42,7 @@ CLONE=1
 FORCE=1
 MODULE_DIR="${MY_PWD}"
 PATTERN=""
+BRANCH="master"
 while [ ! -z "$1" ]; do
   case "$1" in
     -f) 
@@ -67,6 +68,11 @@ while [ ! -z "$1" ]; do
       MODULE_DIR="$1"
       shift
       ;;
+    -b)
+      shift
+      BRANCH="$1"
+      shift
+      ;;
     *)
       GIT_REMOTE="$1"
       shift
@@ -119,6 +125,8 @@ fi
 
 cd "${SITE_DIR}" || { echo "Could not change to site dir ${SITE_DIR}"; exit 1; }
 
+git checkout "${BRANCH}"
+
 git config core.sparsecheckout true
 git config user.name "${GIT_USER}"
 git config user.email "${GIT_EMAIL}"

archiva-modules/deploySite.sh

@@ -27,35 +27,41 @@
 THIS_DIR=$(dirname $0)
 THIS_DIR=$(readlink -f ${THIS_DIR})
 CONTENT_DIR=".site-content"
-
+BRANCH="asf-staging-3.0"
-PROJECT_VERSION=$(grep '<version>' pom.xml |head -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/g')
+VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-SUB_DIR="ref/${PROJECT_VERSION}"
+PUBLISH_PATH=$(mvn help:evaluate -Dexpression=scmPublishPath -q -DforceStdout)
+BRANCH=$(mvn help:evaluate -Dexpression=scmPublishBranch -q -DforceStdout)
+CONTENT_DIR=$(mvn help:evaluate -Dexpression=scmPubCheckoutDirectory -q -DforceStdout)
 
 if [ -d "${CONTENT_DIR}/.git" ]; then
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" checkout ${BRANCH}
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
 fi
 
 echo ">>>> Creating site and reports <<<<" 
-mvn clean site site:stage -Preporting "$@"
+mvn clean site "$@"
+mvn site:stage "$@"
 
 echo "*****************************************"
 echo ">>>> Finished the site stage process <<<<"
 echo "> You can check the content in the folder target/staging or by opening the following url"
-echo "> file://${THIS_DIR}/target/staging/${SUB_DIR}/index.html"
+echo "> file://${THIS_DIR}/target/staging${PUBLISH_PATH}/index.html"
 echo "> "
 echo "> If everything is fine enter yes. After that the publish process will be started."
 echo -n "Do you want to publish (yes/no)? "
 read ANSWER
 
-if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" ]; then
+if [ "${ANSWER}" == "yes" -o "${ANSWER}" == "YES" -o "${ANSWER}" == "y" -o "${ANSWER}" == "Y" ]; then
   echo "> Starting publish process"
   mvn scm-publish:publish-scm "$@"
 else
   echo "> Aborting now"
   echo "> Running git reset in .site-content directory" 
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
+  git -C "${CONTENT_DIR}" clean -f -d
   echo ">>>> Finished <<<<"
 fi
 

archiva-modules/pom.xml

@@ -31,7 +31,9 @@
   <url>https://archiva.apache.org/ref/${project.version}</url>
 
   <properties>
-    <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
+    <scmPubCheckoutDirectory>.site-content</scmPubCheckoutDirectory>
+    <scmPublishBranch>asf-staging</scmPublishBranch>
+    <scmPublishPath>/ref/${project.version}</scmPublishPath>
     <!-- The git repository, where the site content is placed -->
     <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
     <site.staging.base>${project.basedir}</site.staging.base>
@@ -64,7 +66,7 @@
         <artifactId>maven-scm-publish-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
+          <checkinComment>Apache Archiva Module Documentation for ${project.version}</checkinComment>
           <skipDeletedFiles>true</skipDeletedFiles>
           <content>${project.build.directory}/staging</content>
           <tryUpdate>true</tryUpdate>
@@ -90,7 +92,7 @@
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <skipDeploy>true</skipDeploy>
-          <stagingDirectory>${site.staging.base}/target/staging/ref/${project.version}/</stagingDirectory>
+          <stagingDirectory>${site.staging.base}/target/staging${scmPublishPath}/</stagingDirectory>
         </configuration>
         <executions>
           <execution>
@@ -180,6 +182,7 @@
           <javadocVersion>1.8</javadocVersion>
           <source>1.8</source>
           <doclint>none</doclint>
+          <excludePackageNames>*.test</excludePackageNames>
           <links>
             <link>https://docs.oracle.com/javase/8/docs/api</link>
             <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
@@ -195,7 +198,7 @@
           </links>
 
           <linksource>true</linksource>
-          <show>private</show>
+          <show>protected</show>
           <tags>
             <tag>
               <name>todo</name>
@@ -272,6 +275,8 @@
                   <arguments>
                     <argument>-d</argument>
                     <argument>${scmPubCheckoutDirectory}</argument>
+                    <argument>-b</argument>
+                    <argument>${scmPublishBranch}</argument>
                     <argument>${siteRepositoryUrl}</argument>
                   </arguments>
                 </configuration>

archiva-modules/src/site/resources/css/site.css

@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+body {
+  padding-top: 1px;
+}
+
+a.externalLink[href^="https"] {
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
+}
+
+a.externalLink[href^="http"] {
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
+}
+
+#bodyColumn {
+  margin-left: 1.5em;
+}
+
+div#rhs {
+  float: right;
+  text-align: center;
+}
+
+div.mainBox {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 5em;
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
+
+div.mainBox div {
+  padding: 0.4em;
+}
+
+div.newsBox {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 8em;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+div.newsBox div {
+  padding: 0.6em;
+}
+
+div.mainBox span + p a {
+  background: url(../images/arrow.png) no-repeat;
+  background-size: 16px 16px;
+  background-position: right;
+  padding-right: 20px;
+}
+
+div.mainBox span + p a {
+  font-size: 1.5em;
+  /*color: black;*/
+}
+
+div.mainBox span + p a:hover {
+  /*color: blue;*/
+}
+
+.bignumber {
+  position: absolute;
+  color: white;
+  left: 0.25em;
+  font-size: 1.9em;
+}
+
+div.linkBox p {
+  text-align: right;
+  margin-bottom: 0;
+  margin-top: 0;
+  padding-top: 0;
+}
+
+#banner {
+  background: none;
+}
+
+#banner img {
+  margin: 10px;
+}
+
+div.jqmWindow h2, div.jqmWindow p {
+  text-align: center;
+}
+
+span.jqmClose {
+  position: absolute;
+  cursor: pointer;
+  right: 4px;
+  top: 6px;
+}
+
+
+div.section {
+  margin-right: 110px;
+  margin-left: 10px;
+}
+
+.hero-unit p {
+  /* font-weight: inherit;*/
+}
+
+.archivascreenshots {
+  border: 1px solid silver;
+  margin-left: 0.25em;
+  margin-bottom: 0.25em
+}
+
+.rhs span {
+  display: block;
+  font-size: 13px;
+  font-weight: bold;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+
+.container ul li iframe {
+  margin-top: 4px;
+  margin-right: 4px;
+}
+
+.modal-body table {
+  border: 0px;
+}
+
+
+.features-preview:after {
+  background-color: #F5F5F5;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 0 4px 0;
+  color: #9DA0A4;
+  content: "New web UI";
+  font-size: 12px;
+  font-weight: bold;
+  left: -1px;
+  padding: 3px 7px;
+  position: absolute;
+  top: -1px;
+
+}
+.features-preview {
+  background-color: #FFFFFF;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 4px 4px 4px;
+  margin: 15px 0;
+  padding: 39px 19px 14px;
+  position: relative;
+  min-height: 450px;
+}
+
+.carousel .item > img {
+  min-height: 400px;
+}

archiva-modules/src/site/site.xml

@@ -40,7 +40,7 @@
       <gitHub>
         <projectId>apache/archiva</projectId>
         <ribbonOrientation>right</ribbonOrientation>
-        <ribbonColor>black</ribbonColor>
+        <ribbonColor>gray</ribbonColor>
       </gitHub>
     </fluidoSkin>
 
@@ -50,9 +50,12 @@
   <version position="right" />
   
   <body>
+    <head>
+      <![CDATA[<link rel="stylesheet" type="text/css" href="https://archiva.apache.org/css/site.css" />]]>
+    </head>
     <breadcrumbs>
       <item name="Apache" href="https://www.apache.org" />
-      <item name="Archiva" href="https://archiva.apache.org" />
+      <item name="Archiva" href="https://archiva.apache.org/index.html" />
       <item name="Archiva Modules" href="index.html" />
     </breadcrumbs>