You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by zk...@apache.org on 2016/12/22 17:17:50 UTC
svn commit: r1775684 [3/13] - in /river/site/trunk: content/ content/css/
content/dev-doc/ content/doc/ content/font-awesome/
content/font-awesome/css/ content/font-awesome/fonts/
content/font-awesome/less/ content/font-awesome/scss/ content/fonts/ con...
Added: river/site/trunk/content/css/bootstrap.min.css
URL: http://svn.apache.org/viewvc/river/site/trunk/content/css/bootstrap.min.css?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/css/bootstrap.min.css (added)
+++ river/site/trunk/content/css/bootstrap.min.css Thu Dec 22 17:17:48 2016
@@ -0,0 +1,11 @@
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");/*!
+ * bootswatch v3.3.7
+ * Homepage: http://bootswatch.com
+ * Copyright 2012-2016 Thomas Park
+ * Licensed under MIT
+ * Based on Bootstrap
+*//*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
[... 3 lines stripped ...]
Added: river/site/trunk/content/css/bootswatch.less.css
URL: http://svn.apache.org/viewvc/river/site/trunk/content/css/bootswatch.less.css?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/css/bootswatch.less.css (added)
+++ river/site/trunk/content/css/bootswatch.less.css Thu Dec 22 17:17:48 2016
@@ -0,0 +1,146 @@
+// Spacelab 3.3.7
+// Bootswatch
+// -----------------------------------------------------
+
+@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700";
+
+.web-font(@path) {
+ @import url("@{path}");
+}
+.web-font(@web-font-path);
+
+.btn-shadow(@color) {
+ #gradient > .vertical-three-colors(lighten(@color, 15%), @color, 50%, darken(@color, 4%));
+ filter: none;
+ border: 1px solid darken(@color, 10%);
+}
+
+// Navbar =====================================================================
+
+.navbar {
+
+ .btn-shadow(@navbar-default-bg);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
+
+ &-inverse {
+ .btn-shadow(@navbar-inverse-bg);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
+
+ .badge {
+ background-color: #fff;
+ color: @navbar-inverse-bg;
+ }
+ }
+
+ .badge {
+ text-shadow: none;
+ }
+
+ &-nav > li > a,
+ &-nav > li > a:hover {
+ padding-top: (@navbar-padding-vertical + 2px);
+ padding-bottom: (@navbar-padding-vertical - 2px);
+ .transition(color ease-in-out .2s);
+ }
+
+ &-brand,
+ &-brand:hover {
+ .transition(color ease-in-out .2s);
+ }
+
+ .caret,
+ .caret:hover {
+ .transition(border-color ease-in-out .2s);
+ }
+
+ .dropdown-menu {
+ text-shadow: none;
+ }
+}
+
+// Buttons ====================================================================
+
+.btn {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
+
+ &-default {
+ .btn-shadow(@btn-default-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-default-bg, 4%));
+ }
+ }
+
+ &-primary {
+ .btn-shadow(@btn-primary-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-primary-bg, 4%));
+ }
+ }
+
+ &-success {
+ .btn-shadow(@btn-success-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-success-bg, 4%));
+ }
+ }
+
+ &-info {
+ .btn-shadow(@btn-info-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-info-bg, 4%));
+ }
+ }
+
+ &-warning {
+ .btn-shadow(@btn-warning-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-warning-bg, 4%));
+ }
+ }
+
+ &-danger {
+ .btn-shadow(@btn-danger-bg);
+
+ &:hover {
+ .btn-shadow(darken(@btn-danger-bg, 4%));
+ }
+ }
+
+ &-link {
+ text-shadow: none;
+ }
+
+ &:active,
+ &.active {
+ background-image: none;
+ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+ }
+}
+
+// Typography =================================================================
+
+// Tables =====================================================================
+
+// Forms ======================================================================
+
+// Navs =======================================================================
+
+// Indicators =================================================================
+
+// Progress bars ==============================================================
+
+// Containers =================================================================
+
+.panel {
+
+ &-primary {
+ .panel-title {
+ color: #fff;
+ }
+ }
+}
\ No newline at end of file
Modified: river/site/trunk/content/css/river.css
URL: http://svn.apache.org/viewvc/river/site/trunk/content/css/river.css?rev=1775684&r1=1775683&r2=1775684&view=diff
==============================================================================
--- river/site/trunk/content/css/river.css (original)
+++ river/site/trunk/content/css/river.css Thu Dec 22 17:17:48 2016
@@ -1,40 +1,64 @@
/* apache river stylesheet */
-/* fix menu in menu */
-div.navigation ul ul {
- padding-left: inherit ;
+.splash h2 {
+ font-size: 24px
}
-/*----------------------*/
-/* font specs */
+div.codehilite pre {
+ background-color: #f5f5f5 ;
+ margin: 5px 15px 5px 15px ;
+ padding: 1em 1em 1em 1em ;
+}
-h1, h2, h3, h4, h5, h6, div.title {
- font-family: Georgia,'Times New Roman',serif;
- line-height: normal;
- font-weight: bold;
+.space-mn {
+ padding: 5px
+}
+.space-sm {
+ padding: 10px
}
-.title {
- color: white ;
- font-size: 200% ;
- font-weight: bold ;
+.space-md {
+ padding: 15px
}
-/* font specs */
-/*----------------------*/
+.space-lg {
+ padding: 20px
+}
-div.codehilite pre {
- background-color: #f5f5f5 ;
- margin: 5px 15px 5px 15px ;
- padding: 1em 1em 1em 1em ;
+.splash {
+ padding: 9em 0 2em;
+ background-color: #141d27;
+ background-image: url(/images/duna1b.jpg);
+ background-size: cover;
+ background-attachment: scroll;
+ color: #fff;
+ text-align: right
+}
+
+.splash .logo {
+ width: 160px
+}
+
+.splash #social {
+ margin: 2em 0
}
-/*----------------------*/
-/* layout */
+.splash .alert {
+ margin: 2em 0
+}
+
+.list-group-item {
+ padding: 2px 12px;
+}
+
+.navbar-fixed-top {
+ max-height: 50px;
+}
-.title {
- margin-left: 40px ;
+.navbar-brand > img {
+ display: inline;
}
-/* layout */
-/*----------------------*/
+.navbar-brand {
+ padding: 5px 5px;
+}
\ No newline at end of file
Added: river/site/trunk/content/css/variables.less.css
URL: http://svn.apache.org/viewvc/river/site/trunk/content/css/variables.less.css?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/css/variables.less.css (added)
+++ river/site/trunk/content/css/variables.less.css Thu Dec 22 17:17:48 2016
@@ -0,0 +1,869 @@
+// Spacelab 3.3.7
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+@gray-base: #000;
+@gray-darker: #2d2d2d; // #222
+@gray-dark: lighten(@gray-base, 20%); // #333
+@gray: #666; // #555
+@gray-light: lighten(@gray-base, 60%); // #999
+@gray-lighter: lighten(@gray-base, 93.5%); // #eee
+
+@brand-primary: #446E9B;
+@brand-success: #3CB521;
+@brand-info: #3399F3;
+@brand-warning: #D47500;
+@brand-danger: #CD0200;
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+@body-bg: #fff;
+//** Global text color on `<body>`.
+@text-color: @gray;
+
+//** Global textual link color.
+@link-color: @brand-info;
+//** Link hover color set via `darken()` function.
+@link-hover-color: @link-color;
+//** Link hover decoration.
+@link-hover-decoration: underline;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif: Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base: @font-family-sans-serif;
+
+@font-size-base: 14px;
+@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5: @font-size-base;
+@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base: 1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+@headings-font-family: @font-family-base;
+@headings-font-weight: 500;
+@headings-line-height: 1.1;
+@headings-color: @gray-darker;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path: "../fonts/";
+//** File name for all font files.
+@icon-font-name: "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id: "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical: 8px;
+@padding-base-horizontal: 12px;
+
+@padding-large-vertical: 14px;
+@padding-large-horizontal: 16px;
+
+@padding-small-vertical: 5px;
+@padding-small-horizontal: 10px;
+
+@padding-xs-vertical: 1px;
+@padding-xs-horizontal: 5px;
+
+@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small: 1.5;
+
+@border-radius-base: 4px;
+@border-radius-large: 6px;
+@border-radius-small: 3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color: #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg: @brand-primary;
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+@caret-width-base: 4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large: 5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding: 8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding: 5px;
+
+//** Default background color used for all tables.
+@table-bg: transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent: #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover: #f5f5f5;
+@table-bg-active: @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color: #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight: normal;
+
+@btn-default-color: #fff;
+@btn-default-bg: #474949;
+@btn-default-border: @btn-default-bg;
+
+@btn-primary-color: @btn-default-color;
+@btn-primary-bg: @brand-primary;
+@btn-primary-border: @btn-primary-bg;
+
+@btn-success-color: @btn-default-color;
+@btn-success-bg: @brand-success;
+@btn-success-border: @btn-success-bg;
+
+@btn-info-color: @btn-default-color;
+@btn-info-bg: @brand-info;
+@btn-info-border: @btn-info-bg;
+
+@btn-warning-color: @btn-default-color;
+@btn-warning-bg: @brand-warning;
+@btn-warning-border: @btn-warning-bg;
+
+@btn-danger-color: @btn-default-color;
+@btn-danger-bg: @brand-danger;
+@btn-danger-border: @btn-danger-bg;
+
+@btn-link-disabled-color: @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base: @border-radius-base;
+@btn-border-radius-large: @border-radius-large;
+@btn-border-radius-small: @border-radius-small;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+@input-bg: #fff;
+//** `<input disabled>` background color
+@input-bg-disabled: @gray-lighter;
+
+//** Text color for `<input>`s
+@input-color: @text-color;
+//** `<input>` border color
+@input-border: #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+@input-border-radius: @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large: @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small: @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus: #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder: @gray-light;
+
+//** Default `.form-control` height
+@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+@form-group-margin-bottom: 15px;
+
+@legend-color: @text-color;
+@legend-border-color: #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg: @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled: not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg: #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border: rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border: #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg: #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color: @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color: #fff;
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg: @component-active-bg;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color: #fff;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg: @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color: @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color: @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color: #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar: 1000;
+@zindex-dropdown: 1000;
+@zindex-popover: 1060;
+@zindex-tooltip: 1070;
+@zindex-navbar-fixed: 1030;
+@zindex-modal-background: 1040;
+@zindex-modal: 1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs: 480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min: @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone: @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm: 768px;
+@screen-sm-min: @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet: @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md: 992px;
+@screen-md-min: @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop: @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg: 1200px;
+@screen-lg-min: @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop: @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max: (@screen-sm-min - 1);
+@screen-sm-max: (@screen-md-min - 1);
+@screen-md-max: (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns: 12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width: 30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint: @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet: (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm: @container-tablet;
+
+// Medium screen / desktop
+@container-desktop: (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md: @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop: (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg: @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height: 50px;
+@navbar-margin-bottom: @line-height-computed;
+@navbar-border-radius: @border-radius-base;
+@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
+@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height: 340px;
+
+@navbar-default-color: #777;
+@navbar-default-bg: #eee;
+@navbar-default-border: darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color: #777;
+@navbar-default-link-hover-color: @brand-info;
+@navbar-default-link-hover-bg: transparent;
+@navbar-default-link-active-color: @navbar-default-link-hover-color;
+@navbar-default-link-active-bg: transparent;
+@navbar-default-link-disabled-color: #444;
+@navbar-default-link-disabled-bg: transparent;
+
+// Navbar brand label
+@navbar-default-brand-color: @navbar-default-link-color;
+@navbar-default-brand-hover-color: @navbar-default-link-hover-color;
+@navbar-default-brand-hover-bg: transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg: darken(@navbar-default-bg, 6.5%);
+@navbar-default-toggle-icon-bar-bg: #ccc;
+@navbar-default-toggle-border-color: darken(@navbar-default-bg, 6.5%);
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color: #ddd;
+@navbar-inverse-bg: @brand-primary;
+@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color: #ddd;
+@navbar-inverse-link-hover-color: #fff;
+@navbar-inverse-link-hover-bg: transparent;
+@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg: transparent;
+@navbar-inverse-link-disabled-color: #ccc;
+@navbar-inverse-link-disabled-bg: transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color: @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color: #fff;
+@navbar-inverse-brand-hover-bg: transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-toggle-icon-bar-bg: #fff;
+@navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%);
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding: 10px 15px;
+@nav-link-hover-bg: @gray-lighter;
+
+@nav-disabled-link-color: @gray-light;
+@nav-disabled-link-hover-color: @gray-light;
+
+//== Tabs
+@nav-tabs-border-color: #ddd;
+
+@nav-tabs-link-hover-border-color: @gray-lighter;
+
+@nav-tabs-active-link-hover-bg: @body-bg;
+@nav-tabs-active-link-hover-color: @gray;
+@nav-tabs-active-link-hover-border-color: #ddd;
+
+@nav-tabs-justified-link-border-color: #ddd;
+@nav-tabs-justified-active-link-border-color: @body-bg;
+
+//== Pills
+@nav-pills-border-radius: @border-radius-base;
+@nav-pills-active-link-hover-bg: @component-active-bg;
+@nav-pills-active-link-hover-color: @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color: @link-color;
+@pagination-bg: #fff;
+@pagination-border: #ddd;
+
+@pagination-hover-color: @link-hover-color;
+@pagination-hover-bg: @gray-lighter;
+@pagination-hover-border: #ddd;
+
+@pagination-active-color: @gray-light;
+@pagination-active-bg: #f5f5f5;
+@pagination-active-border: #ddd;
+
+@pagination-disabled-color: @gray-light;
+@pagination-disabled-bg: #fff;
+@pagination-disabled-border: #ddd;
+
+
+//== Pager
+//
+//##
+
+@pager-bg: @pagination-bg;
+@pager-border: @pagination-border;
+@pager-border-radius: 15px;
+
+@pager-hover-bg: @pagination-hover-bg;
+
+@pager-active-bg: @pagination-active-bg;
+@pager-active-color: @pagination-active-color;
+
+@pager-disabled-color: @gray-light;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding: 30px;
+@jumbotron-color: inherit;
+@jumbotron-bg: @gray-lighter;
+@jumbotron-heading-color: inherit;
+@jumbotron-font-size: ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text: #468847;
+@state-success-bg: #dff0d8;
+@state-success-border: darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text: #3a87ad;
+@state-info-bg: #d9edf7;
+@state-info-border: darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text: #c09853;
+@state-warning-bg: #fcf8e3;
+@state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
+
+@state-danger-text: #b94a48;
+@state-danger-bg: #f2dede;
+@state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width: 200px;
+//** Tooltip text color
+@tooltip-color: #fff;
+//** Tooltip background color
+@tooltip-bg: #000;
+@tooltip-opacity: .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width: 5px;
+//** Tooltip arrow color
+@tooltip-arrow-color: @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg: #fff;
+//** Popover maximum width
+@popover-max-width: 276px;
+//** Popover border color
+@popover-border-color: rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color: #ccc;
+
+//** Popover title background color
+@popover-title-bg: darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width: 10px;
+//** Popover arrow color
+@popover-arrow-color: @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width: (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg: @btn-default-bg;
+//** Primary label background color
+@label-primary-bg: @brand-primary;
+//** Success label background color
+@label-success-bg: @brand-success;
+//** Info label background color
+@label-info-bg: @brand-info;
+//** Warning label background color
+@label-warning-bg: @brand-warning;
+//** Danger label background color
+@label-danger-bg: @brand-danger;
+
+//** Default label text color
+@label-color: #fff;
+//** Default text color of a linked label
+@label-link-hover-color: #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding: 20px;
+
+//** Padding applied to the modal title
+@modal-title-padding: 15px;
+//** Modal title line-height
+@modal-title-line-height: @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg: #fff;
+//** Modal content border color
+@modal-content-border-color: rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color: #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg: #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity: .5;
+//** Modal header border color
+@modal-header-border-color: #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color: @modal-header-border-color;
+
+@modal-lg: 900px;
+@modal-md: 600px;
+@modal-sm: 300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding: 15px;
+@alert-border-radius: @border-radius-base;
+@alert-link-font-weight: bold;
+
+@alert-success-bg: @state-success-bg;
+@alert-success-text: @state-success-text;
+@alert-success-border: @state-success-border;
+
+@alert-info-bg: @state-info-bg;
+@alert-info-text: @state-info-text;
+@alert-info-border: @state-info-border;
+
+@alert-warning-bg: @state-warning-bg;
+@alert-warning-text: @state-warning-text;
+@alert-warning-border: @state-warning-border;
+
+@alert-danger-bg: @state-danger-bg;
+@alert-danger-text: @state-danger-text;
+@alert-danger-border: @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg: #f5f5f5;
+//** Progress bar text color
+@progress-bar-color: #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius: @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg: @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg: @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg: @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg: @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg: @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg: #fff;
+//** `.list-group-item` border color
+@list-group-border: #ddd;
+//** List group border radius
+@list-group-border-radius: @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg: #f5f5f5;
+//** Text color of active list items
+@list-group-active-color: @component-active-color;
+//** Background color of active list items
+@list-group-active-bg: @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border: @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color: @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg: @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color: #555;
+@list-group-link-hover-color: @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg: #fff;
+@panel-body-padding: 15px;
+@panel-heading-padding: 10px 15px;
+@panel-footer-padding: @panel-heading-padding;
+@panel-border-radius: @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border: #ddd;
+@panel-footer-bg: #f5f5f5;
+
+@panel-default-text: @gray-dark;
+@panel-default-border: #ddd;
+@panel-default-heading-bg: #f5f5f5;
+
+@panel-primary-text: #fff;
+@panel-primary-border: @brand-primary;
+@panel-primary-heading-bg: @brand-primary;
+
+@panel-success-text: @state-success-text;
+@panel-success-border: @state-success-border;
+@panel-success-heading-bg: @state-success-bg;
+
+@panel-info-text: @state-info-text;
+@panel-info-border: @state-info-border;
+@panel-info-heading-bg: @state-info-bg;
+
+@panel-warning-text: @state-warning-text;
+@panel-warning-border: @state-warning-border;
+@panel-warning-heading-bg: @state-warning-bg;
+
+@panel-danger-text: @state-danger-text;
+@panel-danger-border: @state-danger-border;
+@panel-danger-heading-bg: @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding: 4px;
+//** Thumbnail background color
+@thumbnail-bg: @body-bg;
+//** Thumbnail border color
+@thumbnail-border: #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius: @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color: @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding: 9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg: #f5f5f5;
+@well-border: darken(@well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+@badge-color: #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color: #fff;
+@badge-bg: @link-color;
+
+//** Badge text color in active nav link
+@badge-active-color: @link-color;
+//** Badge background color in active nav link
+@badge-active-bg: #fff;
+
+@badge-font-weight: bold;
+@badge-line-height: 1;
+@badge-border-radius: 10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical: 8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg: #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color: #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color: @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator: "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color: #fff;
+@carousel-control-width: 15%;
+@carousel-control-opacity: .5;
+@carousel-control-font-size: 20px;
+
+@carousel-indicator-active-bg: #fff;
+@carousel-indicator-border-color: #fff;
+
+@carousel-caption-color: #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight: bold;
+@close-color: #000;
+@close-text-shadow: 0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color: #c7254e;
+@code-bg: #f9f2f4;
+
+@kbd-color: #fff;
+@kbd-bg: #333;
+
+@pre-bg: #f5f5f5;
+@pre-color: @gray-dark;
+@pre-border-color: #ccc;
+@pre-scrollable-max-height: 340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted: @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color: @gray-light;
+//** Headings small color
+@headings-small-color: @gray-light;
+//** Blockquote small color
+@blockquote-small-color: @gray-light;
+//** Blockquote font size
+@blockquote-font-size: (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color: @gray-lighter;
+//** Page header border color
+@page-header-border-color: @gray-lighter;
+//** Width of horizontal description list titles
+@dl-horizontal-offset: @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint: @grid-float-breakpoint;
+//** Horizontal line color.
+@hr-border: @gray-lighter;
\ No newline at end of file
Copied: river/site/trunk/content/dev-doc/building-a-release.mdtext (from r1775683, river/site/trunk/content/building-a-release.mdtext)
URL: http://svn.apache.org/viewvc/river/site/trunk/content/dev-doc/building-a-release.mdtext?p2=river/site/trunk/content/dev-doc/building-a-release.mdtext&p1=river/site/trunk/content/building-a-release.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/building-a-release.mdtext (original)
+++ river/site/trunk/content/dev-doc/building-a-release.mdtext Thu Dec 22 17:17:48 2016
@@ -16,25 +16,33 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
-# Building a release major release
-n.m n = major release number, m = minor release number
+## Building a release major release
+**n**.**m** **n** = major release number, **m** = minor release number
-## KEYS file
+
+<div class="space-mn"></div>
+### KEYS file
Add your key to the KEYS file in the repo
-## Checkout The Source
+
+<div class="space-mn"></div>
+### Checkout The Source
svn checkout https://svn.apache.org/repos/asf/river/jtsk/trunk river
-## Pre release checks
+
+<div class="space-mn"></div>
+### Pre release checks
* River-trunk should run successful.
* River-verify should run successful. (not yet?)
-## Gather Release Notes From Jira
+
+<div class="space-mn"></div>
+### Gather Release Notes From Jira
First [manage the versions][5] of River using Jira. Make sure there is an appropriate release that Jira issues are have been assigned to. You can then view the [Roadmap][4] screen in Jira to create the release and make sure that the correct Jira issues are associated to it.
@@ -46,7 +54,9 @@ The release notes need to be pasted into
river/trunk/src-doc/static/release-notes/index.html
-## Update Version Numbers
+
+<div class="space-mn"></div>
+### Update Version Numbers
There are version numbers in the following places that need to be updated with the new release number/name.
@@ -55,23 +65,33 @@ There are version numbers in the followi
In the above HTML page, there is also a section on "changes by component" which should also be updated. This should be easy to do by referring to the Jira-generated release notes.
-## Branch the repository
+
+<div class="space-mn"></div>
+### Branch the repository
svn cp https://svn.apache.org/repos/asf/river/jtsk/trunk https://svn.apache.org/repos/asf/river/jtsk/branches/$VERSION
-## Tag the repository
+
+<div class="space-mn"></div>
+### Tag the repository
svn cp https://svn.apache.org/repos/asf/river/jtsk/trunk https://svn.apache.org/repos/asf/river/jtsk/tags/$VERSION
-## Build the release products
+
+<div class="space-mn"></div>
+### Build the release products
ant -Dversion=$VERSION clean release
-## Rat Reports
+
+<div class="space-mn"></div>
+### Rat Reports
./rat_reports.sh
-## Sign the release
+
+<div class="space-mn"></div>
+### Sign the release
- [General Apache Signing Details][1]
- [Release Signing Instructions][2] *See code below, link has a typo in it
@@ -83,7 +103,9 @@ In the above HTML page, there is also a
gpg --print-md SHA512 $f > $f.sha
done;
-## Test the release
+
+<div class="space-mn"></div>
+### Test the release
cp dist/apache-river-$VERSION.tar.gz $SOMEWHERE_ELSE
cd $SOMEWHERE_ELSE
@@ -91,18 +113,24 @@ In the above HTML page, there is also a
cd apache-river-$VERSION
ant build
-## Upload the release
+
+<div class="space-mn"></div>
+### Upload the release
scp RAT* username@people.apache.org:~/public_html/river/
cd dist
scp * username@people.apache.org:~/public_html/river/
-## Allow the community to evaluate the release products
+
+<div class="space-mn"></div>
+### Allow the community to evaluate the release products
* announce availability of candidate on river-dev.
* start [VOTE] thread.
-## Publish release on website
+
+<div class="space-mn"></div>
+### Publish release on website
* checkout the site
* Extract the javadocs from the release archive into ...
* commit
Copied: river/site/trunk/content/dev-doc/building-river.mdtext (from r1775683, river/site/trunk/content/building-river.mdtext)
URL: http://svn.apache.org/viewvc/river/site/trunk/content/dev-doc/building-river.mdtext?p2=river/site/trunk/content/dev-doc/building-river.mdtext&p1=river/site/trunk/content/building-river.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/building-river.mdtext (original)
+++ river/site/trunk/content/dev-doc/building-river.mdtext Thu Dec 22 17:17:48 2016
@@ -16,19 +16,23 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
-# Building River
-## Prerequisites
-In order to build river, you need the following tools:
+## Building River
- * Oracle JDK 1.6
- * Apache ANT 1.8
+<div class="space-sm"></div>
+### Prerequisites
+In order to build River, you need the following tools:
+
+ * Oracle JDK 1.6+
+ * Apache ANT 1.8+
The rest is included in the source archive, and in the SVN.
This article also describes how to setup your IDE to compile River.
-## (warning) Spaces in paths
+<div class="space-mn"></div>
+### Spaces in paths
+<span class="label label-warning">Warning</span>
The build process does not play nicely if you have spaces in your path names. This includes the install path of the JDK.
@@ -42,11 +46,14 @@ So Windows users please be particular aw
If you are running on Windows, it is also advisable to use a forward slash '/' are the path separator. This is acceptable to both Java and Ant, and has the added benefit that the paths will be correct if you decide to run the JTREG tests (some of which require a Unix-like/Cygwin environment to run scripts in). This is particularly important for the `river.home` property which is inherited from in the `qa/build.xml` file and subsequently passed onto the various classes which make up the jtreg tests.
-## Check out the code
+
+<div class="space-mn"></div>
+### Check out the code
See [this page](source-code.html) on how to check out the source code.
-## Build the distribution
+<div class="space-mn"></div>
+### Build the distribution
River can be built simply by running Ant from where you checked the code out from.
@@ -57,9 +64,10 @@ Assume "$RIVER_HOME" is where you have c
Will build all the River JARs required. You will then find them in the ${RIVER_HOME}/lib* directories.
-## Setting up the IDE
-
-### Eclipse
+<div class="space-mn"></div>
+### Setting up the IDE
+<div class="space-mn"></div>
+#### Eclipse
Create your new IDE project using your prefered method (e.g. "Import from SVN" or create a new project using existing source, etc).
@@ -71,8 +79,8 @@ Currently, River should be built with JD
Then you need to add the JARs in `$RIVER_HOME/extlibs` to your classpath.
That should everything that Eclipse needs to be happy with the River code.
-
-### NetBeans
+<div class="space-mn"></div>
+#### NetBeans
* Checkout the trunk.
* In Netbeans 7.2 do:
* Open Project
@@ -80,17 +88,21 @@ That should everything that Eclipse need
* Open the `onebigjar` project.
* Click on build.
-# Testing River
+
+<div class="space-lg"></div>
+## Testing River
This build process runs the (limited) suite of unit tests that comes with River. River is tested predominantly by using [jtreg](http://openjdk.java.net/jtreg/) and the QA test suite.
-## The JUnit tests
+<div class="space-mn"></div>
+### The JUnit tests
The JUnit tests can be found in `$RIVER_HOME/test/src` you must also add the JARs found in `$RIVER_HOME/test/lib` onto the classpath for your tests.
It's easiest to run these tests from your IDE. In Eclipse, for example, once `$RIVER_HOME/test/src` is set at the test source directory, right-clicking the project and hitting "Run as JUnit test" is all that is required.
-## The QA Test Suite
+<div class="space-mn"></div>
+### The QA Test Suite
The QA tests can also be run from the Ant script. You must make sure the Ant you are using is using the correct JDK. You can run "ant diagnostics" in the project directory to find out which JVM Ant is using.
Make sure that you have the following in your build.properties file which you will need to create in `$RIVER_HOME`.
@@ -100,17 +112,21 @@ Make sure that you have the following in
jdk1.5.home=/path/to/java1.5
jtreg.dir=$RIVER_HOME/jtsk/qa/jtreg
-> Please note the remark above about using paths which contains spaces and the use of '/' over '\'.
+<div class="alert alert-info">
+Please note the remark above about using paths which contains spaces and the use of '/' over '\'.
+</div>
Execute the following:
cd $RIVER_HOME
cd qa.run
-### Running just a few tests
+<div class="space-mn"></div>
+#### Running just a few tests
Running the entire QA suite tasks a significant portion of time; currently around the 17 hour mark. It is therefore useful to be able to specify a subset of categories or even specific tests to run.
-#### By settings in the properties file
+<div class="space-mn"></div>
+##### By settings in the properties file
When running the QA tests with Ant, this is done by including the following in the Ant build.properties file.
# runs a specified category
@@ -121,17 +137,20 @@ When running the QA tests with Ant, this
# e.g. run.tests=com/sun/jini/test/spec/constraint/coreconstraint/PrincipalElementsTest.td
run.tests=path/to/test/TestName.td
-#### By specifying on the commandline
+<div class="space-mn"></div>
+##### By specifying on the commandline
From the qa directory:
ant -Drun.tests=com/sun/jini/test/spec/constraint/coreconstraint/PrincipalElementsTest.td run-tests
Existing QA tests can be found in the following path; `$RIVER_HOME/qa/src/com/sun/jini/test/**"`
-### Categories
+<div class="space-mn"></div>
+#### Categories
You can find the test categories on [Test categories](testing-categories.html)
-## JTREG tests
+<div class="space-mn"></div>
+### JTREG tests
You must first download and install jtreg following the instructions on their site.
@@ -151,13 +170,15 @@ The JTREG tests can then be run by execu
JTREG will create the directory `$RIVER_HOME/qa/jtreg/JTreport` which contains a report of the test run.
-### Running specific JTREG tests
+<div class="space-mn"></div>
+#### Running specific JTREG tests
_todo_
-### Known Problems
+<div class="space-mn"></div>
+#### Known Problems
There are the following known problems with the jtreg tests:
1. Running the tests in a Windows/Cygwin environment is not 100% working yet
- 1. Some of the tests require a kerberos environment, so these will obviously fail when no such setup is available
+ 1. Some of the tests require a Kerberos environment, so these will obviously fail when no such setup is available
1. It is known that test `net/jini/url/httpmd/TestEqual.java` fails. Please see [Jira issue River-375](https://issues.apache.org/jira/browse/RIVER-375) for details.
\ No newline at end of file
Copied: river/site/trunk/content/dev-doc/ci.mdtext (from r1775683, river/site/trunk/content/ci.mdtext)
URL: http://svn.apache.org/viewvc/river/site/trunk/content/dev-doc/ci.mdtext?p2=river/site/trunk/content/dev-doc/ci.mdtext&p1=river/site/trunk/content/ci.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/ci.mdtext (original)
+++ river/site/trunk/content/dev-doc/ci.mdtext Thu Dec 22 17:17:48 2016
@@ -16,6 +16,9 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
+
+### Continuous Integration
+
In order to find problems early, river uses [Continuous Integration](http://en.wikipedia.org/wiki/Continuous_integration).
After changes the builds are scheduled on the [Apache build server](https://builds.apache.org/).
@@ -32,17 +35,22 @@ River-QA-Runtime |
For their current status, see: <https://builds.apache.org/view/M-R/view/River/>
-## River-trunk jobs
+<div class="space-mn"></div>
+### River-trunk jobs
The River trunk build is only run on Ubuntu. The naming scheme is:
River-trunk-[jdkid]
-## River-QA- jobs
+
+<div class="space-mn"></div>
+### River-QA- jobs
The River QA jobs naming scheme used is: River-QA-[platformid]-[jdkid] optional [-branchid]
The River-trunk-QA-* jobs, build the river-runtime and the river-qa,
and tests the river-runtime with the river-qa framework.
-## Platforms and Jdks
+
+<div class="space-mn"></div>
+### Platforms and Jdks
The current platforms are: Solaris, Ubuntu, Windows
The current jdk ids are: jdk6 jdk7
Copied: river/site/trunk/content/dev-doc/development-process.mdtext (from r1775683, river/site/trunk/content/development-process.mdtext)
URL: http://svn.apache.org/viewvc/river/site/trunk/content/dev-doc/development-process.mdtext?p2=river/site/trunk/content/dev-doc/development-process.mdtext&p1=river/site/trunk/content/development-process.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/development-process.mdtext (original)
+++ river/site/trunk/content/dev-doc/development-process.mdtext Thu Dec 22 17:17:48 2016
@@ -1,14 +1,33 @@
Title: Development Process
+Notice: 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.
+
[TOC]
-# River Development Process
+### River Development Process
+<div class="space-lg"></div>
-## River build server
+#### River build server
River is built on the Apache Hudson server. The projects can be found [here](https://hudson.apache.org/hudson/view/M-R/view/River/). More on this process: [Continuous Integration](ci.html)
-## Tracking issues and changes
+<div class="space-mn"></div>
+#### Tracking issues and changes
* A JIRA issue is required for any substantive change.
In order to keep the list of JIRA issues under control, it is expected that any controversial issue or user request for a feature or design change be discussed on the dev list prior to entering it into JIRA.
@@ -18,7 +37,9 @@ In order to keep the list of JIRA issues
* Issue discussions
The preferred place of discussion on issues is the river-dev mail list. A link to the beginning of the mail thread on the issue should be placed in the JIRA issue so that users looking through JIRA can easily view the thread of discussion on an issue. Please keep the Subject line the same so that the email thread hangs together. It's also recommended that a summary/conclusion on the thread be recorded in the JIRA issue itself.
-## Handling Security -related Issues
+
+<div class="space-mn"></div>
+#### Handling Security -related Issues
There are three options associated with the "Security Level" field in the JIRA instance:
* "None"
@@ -31,7 +52,8 @@ If the issue is acknowledged as a valid
As soon as appropriate (for example, when the impact is understood and/or there is a resolution/fix developed), the "Security Level" should be changed to "Security risk, visible to anyone" and an explanation/discussion should occur in the broader River community on the river-dev list.
-## Code Reviews
+<div class="space-mn"></div>
+#### Code Reviews
* for public API changes:
[RTC](http://apache.org/foundation/glossary.html#ReviewThenCommit) These changes have potentially broad effects on developers and users, and therefore will require a code review and vote. Since some of these changes will affect the API docs ('specs'), everyone within the Jini/River community is encouraged to review and vote. The Committer votes are binding, but the sentiment of the entire community will be strongly considered.
@@ -39,12 +61,159 @@ As soon as appropriate (for example, whe
* for all other changes:
[CTR](http://apache.org/foundation/glossary.html#CommitThenReview) Although CTR is what is specified, developers should feel comfortable requesting the list for peer review before committing.
-## Testing
-Developing test cases and running test suites are desired but not required prior to an integration. If unit tests are created for a change, the developer is encouraged to add them to the JIRA issue for sharing.
+<div class="space-mn"></div>
+#### Testing
+
+Developing test cases and running test suites are desired but not required prior to an integration. If unit tests are
+created for a change, the developer is encouraged to add them to the JIRA issue for sharing. <br>
+Here is a list of individually executable
+<a href="javascript:void(0);" data-toggle="modal" data-target="#myModal">test categories</a>.
+
+<div id="myModal" class="modal fade" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title">Test categories</h4>
+ </div>
+
+ <div class="modal-body">
+ <div class="list-group">
+ <a href="#" class="list-group-item">activation</a>
+ <a href="#" class="list-group-item">activation_spec</a>
+ <a href="#" class="list-group-item">allgroups</a>
+<a href="#" class="list-group-item">basicinvocationdispatcher</a>
+<a href="#" class="list-group-item">basicinvocationdispatcher_spec</a>
+<a href="#" class="list-group-item">basicinvocationhandler</a>
+<a href="#" class="list-group-item">basicinvocationhandler_spec</a>
+<a href="#" class="list-group-item">basicobjectendpoint</a>
+<a href="#" class="list-group-item">basicobjectendpoint_spec</a>
+<a href="#" class="list-group-item">config</a>
+<a href="#" class="list-group-item">config_spec</a>
+<a href="#" class="list-group-item">constraint</a>
+<a href="#" class="list-group-item">constraint_spec</a>
+<a href="#" class="list-group-item">coreconstraint</a>
+<a href="#" class="list-group-item">coreconstraint_spec</a>
+<a href="#" class="list-group-item">discardproblem</a>
+<a href="#" class="list-group-item">discoverymanager</a>
+<a href="#" class="list-group-item">discoverymanager_impl</a>
+<a href="#" class="list-group-item">discoverymanager_spec</a>
+<a href="#" class="list-group-item">discoveryproviders</a>
+<a href="#" class="list-group-item">discoveryproviders_impl</a>
+<a href="#" class="list-group-item">discoveryservice</a>
+<a href="#" class="list-group-item">discoveryservice_impl</a>
+<a href="#" class="list-group-item">discoveryservice_spec</a>
+<a href="#" class="list-group-item">discoveryserviceevent</a>
+<a href="#" class="list-group-item">discoveryservicelease</a>
+<a href="#" class="list-group-item">end2end</a>
+<a href="#" class="list-group-item">end2end_impl</a>
+<a href="#" class="list-group-item">eventmailbox</a>
+<a href="#" class="list-group-item">eventmailbox_impl</a>
+<a href="#" class="list-group-item">eventmailbox_spec</a>
+<a href="#" class="list-group-item">export</a>
+<a href="#" class="list-group-item">export_spec</a>
+<a href="#" class="list-group-item">fiddleradmin</a>
+<a href="#" class="list-group-item">fiddlerfiddleradmin</a>
+<a href="#" class="list-group-item">fiddlerjoinadmin</a>
+<a href="#" class="list-group-item">id</a>
+<a href="#" class="list-group-item">id_spec</a>
+<a href="#" class="list-group-item">iiop</a>
+<a href="#" class="list-group-item">iiop_spec</a>
+<a href="#" class="list-group-item">impllocatordiscovery</a>
+<a href="#" class="list-group-item">impllookupdiscovery</a>
+<a href="#" class="list-group-item">implservicediscovery</a>
+<a href="#" class="list-group-item">implservicediscoveryevent</a>
+<a href="#" class="list-group-item">io</a>
+<a href="#" class="list-group-item">io_spec</a>
+<a href="#" class="list-group-item">javaspace</a>
+<a href="#" class="list-group-item">javaspace05_conformance</a>
+<a href="#" class="list-group-item">javaspace_conformance</a>
+<a href="#" class="list-group-item">javaspace_impl</a>
+<a href="#" class="list-group-item">javaspace_impl_admin</a>
+<a href="#" class="list-group-item">javaspace_impl_api</a>
+<a href="#" class="list-group-item">javaspace_impl_javaspace05</a>
+<a href="#" class="list-group-item">javaspace_impl_leasing</a>
+<a href="#" class="list-group-item">javaspace_impl_matching</a>
+<a href="#" class="list-group-item">javaspace_impl_notify</a>
+<a href="#" class="list-group-item">javaspace_impl_transaction</a>
+<a href="#" class="list-group-item">javaspace_spec</a>
+<a href="#" class="list-group-item">jeri</a>
+<a href="#" class="list-group-item">jeri_spec</a>
+<a href="#" class="list-group-item">joinmanager</a>
+<a href="#" class="list-group-item">joinmanager_impl</a>
+<a href="#" class="list-group-item">joinmanager_spec</a>
+<a href="#" class="list-group-item">jrmp</a>
+<a href="#" class="list-group-item">jrmp_spec</a>
+<a href="#" class="list-group-item">loader</a>
+<a href="#" class="list-group-item">loader_spec</a>
+<a href="#" class="list-group-item">locatordiscovery</a>
+<a href="#" class="list-group-item">locatordiscovery_impl</a>
+<a href="#" class="list-group-item">locatordiscovery_spec</a>
+<a href="#" class="list-group-item">lookupdiscovery</a>
+<a href="#" class="list-group-item">lookupdiscovery_impl</a>
+<a href="#" class="list-group-item">lookupdiscovery_spec</a>
+<a href="#" class="list-group-item">lookupservice</a>
+<a href="#" class="list-group-item">lookupservice_impl</a>
+<a href="#" class="list-group-item">lookupservice_spec</a>
+<a href="#" class="list-group-item">policyprovider</a>
+<a href="#" class="list-group-item">policyprovider_spec</a>
+<a href="#" class="list-group-item">proxytrust</a>
+<a href="#" class="list-group-item">proxytrust_spec</a>
+<a href="#" class="list-group-item">reliability</a>
+<a href="#" class="list-group-item">renewalmanager</a>
+<a href="#" class="list-group-item">renewalmanager_spec</a>
+<a href="#" class="list-group-item">renewalservice</a>
+<a href="#" class="list-group-item">renewalservice_impl</a>
+<a href="#" class="list-group-item">renewalservice_spec</a>
+<a href="#" class="list-group-item">scalability</a>
+<a href="#" class="list-group-item">security</a>
+<a href="#" class="list-group-item">security_spec</a>
+<a href="#" class="list-group-item">servicediscovery</a>
+<a href="#" class="list-group-item">servicediscovery_impl</a>
+<a href="#" class="list-group-item">servicediscovery_spec</a>
+<a href="#" class="list-group-item">servicediscoverycache</a>
+<a href="#" class="list-group-item">servicediscoverydiscovery</a>
+<a href="#" class="list-group-item">servicediscoveryevent</a>
+<a href="#" class="list-group-item">servicediscoverylookup</a>
+<a href="#" class="list-group-item">snapshot</a>
+<a href="#" class="list-group-item">spec</a>
+<a href="#" class="list-group-item">speclocatordiscovery</a>
+<a href="#" class="list-group-item">speclookupdiscovery</a>
+<a href="#" class="list-group-item">specservicediscovery</a>
+<a href="#" class="list-group-item">specservicediscoverycache</a>
+<a href="#" class="list-group-item">specservicediscoverydiscovery</a>
+<a href="#" class="list-group-item">specservicediscoveryevent</a>
+<a href="#" class="list-group-item">specservicediscoverylookup</a>
+<a href="#" class="list-group-item">start</a>
+<a href="#" class="list-group-item">start_impl</a>
+<a href="#" class="list-group-item">stress</a>
+<a href="#" class="list-group-item">test_set00</a>
+<a href="#" class="list-group-item">test_set01</a>
+<a href="#" class="list-group-item">test_set02</a>
+<a href="#" class="list-group-item">test_set03</a>
+<a href="#" class="list-group-item">test_set04</a>
+<a href="#" class="list-group-item">thread</a>
+<a href="#" class="list-group-item">thread_impl</a>
+<a href="#" class="list-group-item">txnmanager</a>
+<a href="#" class="list-group-item">txnmanager_impl</a>
+<a href="#" class="list-group-item">txnmanager_spec</a>
+<a href="#" class="list-group-item">url</a>
+<a href="#" class="list-group-item">url_spec</a>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+ </div>
+ </div>
+ </div>
+</div>
+
+
-## Version Numbering
+<div class="space-mn"></div>
+#### Version Numbering
Each Apache River deliverable has a version number of:
@@ -56,7 +225,9 @@ Each Apache River deliverable has a vers
The major version number will in general only be increased in case of major changes that might introduce compatibility problems or represent some fundamental improvements. The minor versions reflect the various feature releases, the last part of the version number reflects the maintenance release.
-## Branching Policy
+
+<div class="space-mn"></div>
+#### Branching Policy
Ongoing development for the next release takes place in the `/trunk`. Once feature complete for a (non maintenance) release the trunk is branched into `/branches/<m.n>` which in general also reflects the moment a release candidate is presented to the public in a fairly short period of time. Ongoing development continues in the `/trunk`, issues found against the release candidate will be fixed in `/branches/<m.n>` and likely merged into the `/trunk`.
@@ -97,3 +268,31 @@ Although ongoing development should take
| \
| \ ------- /tags/3.0.1/
</pre>
+
+
+<div class="space-sm"></div>
+### Coding conventions
+
+<div class="space-mn"></div>
+#### Indentation
+Tabs are not used. Default indentation is 4 spaces.
+
+<div class="space-mn"></div>
+#### Other
+Contributors are advised to read the [Code Conventions for the Java](http://www.oracle.com/technetwork/java/codeconvtoc-136057.html)
+and try to adhere as much as possible to these conventions.
+
+<div class="space-mn"></div>
+#### Reformatting
+If the reformatting involves a large part of the code,
+a clearly labeled 'reformatting' commit in between is recommended.
+Keeping your reformatting changes limited,
+reduces the change of merging conflicts by your fellow committers.
+
+<div class="space-mn"></div>
+#### Older sources
+We do not actively search and reformat source files
+that are not formatted according to this convention.
+
+Older sources are best viewed with tab stops at 8 space
+intervals.
\ No newline at end of file
Copied: river/site/trunk/content/dev-doc/source-code.mdtext (from r1775683, river/site/trunk/content/source-code.mdtext)
URL: http://svn.apache.org/viewvc/river/site/trunk/content/dev-doc/source-code.mdtext?p2=river/site/trunk/content/dev-doc/source-code.mdtext&p1=river/site/trunk/content/source-code.mdtext&r1=1775683&r2=1775684&rev=1775684&view=diff
==============================================================================
--- river/site/trunk/content/source-code.mdtext (original)
+++ river/site/trunk/content/dev-doc/source-code.mdtext Thu Dec 22 17:17:48 2016
@@ -1,13 +1,31 @@
Title: Source Code
+Notice: 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.
-# River source code
+
+### River source code
River uses [Subversion](http://subversion.tigris.org/) to manage its source code. Instructions on Subversion use can be found [here](http://svnbook.red-bean.com).
The source code for the various deliverables of Apache River can be freely browsed at <http://svn.apache.org/viewvc/river/>.
-## Anonymous access
+####
+#### Anonymous access
The Apache River source can be checked out anonymously with this command (for the jtsk deliverable):
@@ -19,20 +37,28 @@ release was in the 2.2 branch.
svn checkout http://svn.apache.org/repos/asf/river/jtsk/branches/2.2
-## Access from behind a firewall
+
+####
+#### Access from behind a firewall
-For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via HTTPS:
+For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository,
+you can try to access it via HTTPS:
svn checkout https://svn.apache.org/repos/asf/river/jtsk/trunk river
-## Access through a proxy
+####
+#### Access through a proxy
-The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)
+The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration
+file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is
+located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note
+this is a hidden directory.)
-There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.
+There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client
+and run any command; this will cause the configuration directory and template files to be created.
Example : Edit the 'servers' file and add something like :
@@ -42,25 +68,31 @@ Example : Edit the 'servers' file and ad
http-proxy-port = 3128
-## Submitting a Patch
+####
+#### Submitting a Patch
-
-If you make changes to River, and would like to contribute the to the project, you should create a patch and post it to the [River JIRA issue tracker](http://issues.apache.org/jira/browse/RIVER). To create a patch, simply execute the following command:
+If you make changes to River, and would like to contribute the to the project, you should create a patch and post it
+to the [River JIRA issue tracker](http://issues.apache.org/jira/browse/RIVER). To create a patch, simply execute the
+following command:
svn diff > your-changes.patch
If you've added new files, remember to "svn add" them so they get included in the diff.
-## Developer Access
+####
+#### Developer Access
-Everyone can access the River Subversion repository via HTTPS, but River Committers must checkout the Subversion repository via HTTPS.
+Everyone can access the River Subversion repository via HTTPS, but River Committers must checkout the Subversion
+repository via HTTPS.
svn checkout https://svn.apache.org/repos/asf/river/jtsk/trunk river
-
-To commit changes to the repository, you must set your password on the Apache Subversion server. To set your password, use ssh to connect to svn.apache.org, and enter the command *svnpasswd*. This will prompt you to enter a svn password of your choice (pick a safe password). Now, now your are ready to commit changes using your username/password. Execute the following command to commit your changes (svn will prompt you for your password)
+To commit changes to the repository, you must set your password on the Apache Subversion server. To set your password,
+ use ssh to connect to svn.apache.org, and enter the command *svnpasswd*. This will prompt you to enter a svn password
+ of your choice (pick a safe password). Now, now your are ready to commit changes using your username/password.
+ Execute the following command to commit your changes (svn will prompt you for your password)
svn commit --username your-username
@@ -68,7 +100,9 @@ To commit changes to the repository, you
Password for 'your-username': your-password
-You can also pass your password on the command line directly, but this is a security problem on multiuser unix computers (the command line arguments are available via the ps command). Here is the command if you are Windows or a single user unix computer:
+You can also pass your password on the command line directly, but this is a security problem on multiuser unix
+computers (the command line arguments are available via the ps command). Here is the command if you are Windows or
+a single user unix computer:
svn commit --username your-username --password your-password
Added: river/site/trunk/content/font-awesome/HELP-US-OUT.txt
URL: http://svn.apache.org/viewvc/river/site/trunk/content/font-awesome/HELP-US-OUT.txt?rev=1775684&view=auto
==============================================================================
--- river/site/trunk/content/font-awesome/HELP-US-OUT.txt (added)
+++ river/site/trunk/content/font-awesome/HELP-US-OUT.txt Thu Dec 22 17:17:48 2016
@@ -0,0 +1,7 @@
+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy