You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by vi...@apache.org on 2019/05/04 15:39:48 UTC

[netbeans-website] branch master updated: Updating bits.netbeans.org information (#357)

This is an automated email from the ASF dual-hosted git repository.

vieiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 8059177  Updating bits.netbeans.org information (#357)
8059177 is described below

commit 8059177fbbd44dda6574c67e2af50a667a86b941
Author: Antonio Vieiro <vi...@users.noreply.github.com>
AuthorDate: Sat May 4 17:39:43 2019 +0200

    Updating bits.netbeans.org information (#357)
    
    * Updating bits.netbeans.org information
    * Adding our own IAC Tools
---
 bits.netbeans.org/README.asciidoc | 37 +++++++++++++++++++++++------
 bits.netbeans.org/build.xml       | 50 ---------------------------------------
 bits.netbeans.org/index.html      |  9 -------
 3 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/bits.netbeans.org/README.asciidoc b/bits.netbeans.org/README.asciidoc
index 3efc5da..733cca8 100644
--- a/bits.netbeans.org/README.asciidoc
+++ b/bits.netbeans.org/README.asciidoc
@@ -1,12 +1,35 @@
 = bits.netbeans.org
 
-This directory will be responsible for building the bits.netbeans.org website.
+bits.netbeans.org is a virtual host in the NetBeans VM.
 
-It currently has a `build.xml` file that builds the NetBeans javadoc and extracts it in the `javadoc` directory.
+== Infrastructure as code
 
-== TODO:
-  - Improve the `build.xml` file to take into account GitHub branches and NetBeans releases.
-  - Build javadoc zip files?
-  - Build other parts of http://bits.netbeans.org
-  - Publish this somewhere (http://bits.apache.netbeans.org?)
+The digital certificates and other virtual host settings are managed with
+link:https://puppet.com/solutions/infrastructure-as-code[puppet], in a joint
+effort between the NetBeans Team (for configuration) and the ASF-Infra Team
+(for updates) through JIRA.
+
+The NetBeans Team also maintains some convenience tools that generate Jenkins scripts
+to ease JavaDoc generation. 
+
+These infrastructure as code tools can be found here: https://github.com/apache/netbeans-tools/tree/master/buildscripts/conveniences
+
+== The NetBeans APIs
+
+Currently bits.netbeans.org hosts the APIs of NetBeans and different Maven stuff.
+
+APIs are generated through different Jenkins jobs. Each hour a script in the
+NetBeans VM checks if a download is required and downloads the API zip file.
+Then, if required, the API zip file is extracted and served.
+
+The Jenkins jobs responsible for generating the APIs are:
+
+[options="header", cols="1,2,4"]
+|===
+| Release | Jenkins job | Generated API
+| NetBeans Dev | link:https://builds.apache.org/job/netbeans-master-apidocmaven/[netbeans-master-apidocmaven] | https://bits.netbeans.org/dev/javadoc
+| NetBeans 11.0 | link:https://builds.apache.org/job/netbeans-r110-apidocmaven/[netbeans-r110-apidocmaven] | https://bits.netbeans.org/11.0/javadoc/
+| NetBeans 10.0 | link:https://builds.apache.org/job/netbeans-r100-apidocmaven/[netbeans-r100-apidocmaven] | https://bits.netbeans.org/10.0/javadoc/
+| NetBeans 9.0 | link:https://builds.apache.org/job/netbeans-r90-apidocmaven/[netbeans-r90-apidocmaven] | https://bits.netbeans.org/9.0/javadoc/ 
+| Maven Site | link:https://builds.apache.org/job/netbeans-mavenutils-website/[netbeans-mavenutils-website] | https://bits.netbeans.org/mavenutilities/nbm-shared/index.html
 
diff --git a/bits.netbeans.org/build.xml b/bits.netbeans.org/build.xml
deleted file mode 100644
index f7a3a02..0000000
--- a/bits.netbeans.org/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-     A simple ant file that:
-        - checkouts out ${netbeans.branch} into ${netbeans.src.dir}
-        - runs 'ant 
-                -f ${netbeans.src.dir}/nbbuild/javadoctools/build.xml 
-                -Djavadoc.web.root=http://bits.netbeans.apache.org/${netbeans.branch}/javadoc 
-                build-javadoc '
--->
-<project name="bits.netbeans.org" default="help">
-
-    <!-- Default branch to checkout -->
-    <property name="netbeans.branch">master</property>
-
-    <!-- Base url for the final javadoc -->
-    <property name="netbeans.url">http://bits.netbeans.apache.org/${netbeans.branch}/javadoc</property>
-
-    <!-- Help message -->
-    <target name="help">
-        <echo>
-ant javadoc - Builds the NetBeans javadoc.
-Mandatory properties:
--Dnetbeans.src.dir=Directory with a clone of https://github.com/apache/netbeans
--Dnetbeans.branch=Branch ('master' if unset)
-        </echo>
-    </target>
-
-    <!-- Property checking -->
-    <target name="-prepare">
-        <fail unless="netbeans.branch">Please specify a -Dnetbeans.branch value</fail>
-        <fail unless="netbeans.src.dir">Please specify a -Dnetbeans.src.dir</fail>
-    </target>
-
-    <!-- Javadoc target -->
-    <target name="javadoc" depends="-prepare">
-        <echo message="Checking out branch ${netbeans.branch}..." />
-        <exec executable="git" failifexecutionfails="true" dir="${netbeans.src.dir}">
-            <arg value="checkout" />
-            <arg value="${netbeans.branch}" />
-        </exec>
-        <echo message="Building javadoc..." />
-        <echo message="  Using base ${netbeans.url}" />
-        <ant
-            dir="${netbeans.src.dir}/nbbuild/javadoctools"
-            antfile="build.xml"
-            target="build-javadoc">
-            <property name="javadoc.web.root">${netbeans.url}</property>
-        </ant>
-    </target>
-</project>
diff --git a/bits.netbeans.org/index.html b/bits.netbeans.org/index.html
deleted file mode 100644
index df2e665..0000000
--- a/bits.netbeans.org/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <body>
-        <h1>bits.netbeans.org</h1>
-        <ul>
-            <li><a href="javadoc">javadoc</a></li>
-        </ul>
-    </body>
-</html>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists