deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r932465 [2/2] - in /websites/staging/deltaspike/trunk/content: ./ staging/documentation/
Date Fri, 12 Dec 2014 17:39:19 GMT
Modified: websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/jsf.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->
@@ -182,8 +180,20 @@ body {
 </li>
 <li><a href="#_available_modes">Available modes</a>
 <ul class="sectlevel3">
-<li><a href="#_clientwindow">CLIENTWINDOW</a></li>
-<li><a href="#_lazy">LAZY</a></li>
+<li><a href="#_clientwindow">CLIENTWINDOW</a>
+<ul class="sectlevel4">
+<li><a href="#_advantage">Advantage</a></li>
+<li><a href="#_disadvantage">Disadvantage</a></li>
+<li><a href="#_change_windowhandler_html">Change windowhandler.html</a></li>
+</ul>
+</li>
+<li><a href="#_lazy">LAZY</a>
+<ul class="sectlevel4">
+<li><a href="#_advantage_2">Advantage</a></li>
+<li><a href="#_disadvantage_2">Disadvantage</a></li>
+<li><a href="#_workflow_example">Workflow example</a></li>
+</ul>
+</li>
 <li><a href="#_none">NONE</a></li>
 <li><a href="#_delegated">DELEGATED</a></li>
 <li><a href="#_custom">CUSTOM</a></li>
@@ -218,9 +228,18 @@ body {
 <li><a href="#_bean_discovery_mode_annotated">Bean-discovery-mode annotated</a></li>
 <li><a href="#_basic_api_usages">Basic API usages</a>
 <ul class="sectlevel3">
-<li><a href="#_file_view_and_folder_folder_paths">File (@View) and Folder (@Folder) paths</a></li>
+<li><a href="#_file_view_and_folder_folder_paths">File (@View) and Folder (@Folder) paths</a>
+<ul class="sectlevel4">
+<li><a href="#__folder_name">@Folder#name</a></li>
+<li><a href="#__view">@View</a></li>
+</ul>
+</li>
 <li><a href="#_navigation_parameters">Navigation Parameters</a></li>
-<li><a href="#_static_configuration_via_navigationparameter">Static Configuration via @NavigationParameter</a></li>
+<li><a href="#_static_configuration_via_navigationparameter">Static Configuration via @NavigationParameter</a>
+<ul class="sectlevel4">
+<li><a href="#_dynamic_configuration_via_navigationparametercontext">Dynamic Configuration via NavigationParameterContext</a></li>
+</ul>
+</li>
 <li><a href="#_security_integration_via_secured">Security Integration via @Secured</a></li>
 <li><a href="#_view_controller_callbacks_via_viewcontrollerref">View-Controller Callbacks via @ViewControllerRef</a></li>
 <li><a href="#_referencing_views_via_viewref">Referencing Views via @ViewRef</a></li>

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/partial-bean.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/projectstage.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/scheduler.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/security.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/security.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/security.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/servlet.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/source.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/source.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/source.html Fri Dec 12 17:39:18 2014
@@ -6,7 +6,7 @@
 <meta name="description" content="deltaspike-generate-pages">
 <meta name="author" content="chm">
 
-<title>Contribute to the DeltaSpike Source</title>
+<title>Get Source and compile it</title>
 
 <!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
 
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->
@@ -166,132 +164,129 @@ body {
 		<div class="row">
 			<div class="span12">
 				<div class="page-title">
-			    <h1>Contribute to the DeltaSpike Source</h1>
+			    <h1>Get Source and compile it</h1>
                 </div>
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
-<li><a href="#_1_get_the_source">1. Get the Source</a></li>
-<li><a href="#_2_make_additions_and_changes_to_the_source">2. Make Additions and Changes to the Source</a>
+<li><a href="#_introduction">Introduction</a></li>
+<li><a href="#_scm_repository">SCM / Repository</a>
+<ul class="sectlevel2">
+<li><a href="#_initial_checkout">Initial 'checkout'</a></li>
+<li><a href="#_update_existing_clone">Update existing clone</a></li>
+<li><a href="#_read_only_mirrors">Read-only Mirrors</a>
+<ul class="sectlevel3">
+<li><a href="#_github_mirror">GitHub-Mirror</a></li>
+</ul>
+</li>
+<li><a href="#_git_workflow">GIT Workflow</a></li>
+</ul>
+</li>
+<li><a href="#_build">Build</a></li>
+<li><a href="#_tools_ide">Tools / IDE</a>
 <ul class="sectlevel2">
 <li><a href="#_intellij">IntelliJ</a></li>
 <li><a href="#_eclipse">Eclipse</a></li>
 </ul>
 </li>
-<li><a href="#_3_build_the_source">3. Build the Source</a></li>
-<li><a href="#_4_make_a_pull_request">4. Make a Pull Request</a></li>
-<li><a href="#_git_resources">Git Resources</a></li>
 </ul>
        	 		<hr>	
        	 		
-				<div id="preamble">
+				<div class="sect1">
+<h2 id="_introduction">Introduction</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>If you are looking to contribute to the DeltaSpike source, you must start with the latest version of the code base. DeltaSpike source is stored in the Apache Git repository at <a href="https://git-wip-us.apache.org/repos/asf/deltaspike.git" class="bare">https://git-wip-us.apache.org/repos/asf/deltaspike.git</a></p>
-</div>
-<div class="paragraph">
-<p>It is also important that you follow the git workflows we have established for the project to ensure efficient and clean collaboration as detailed here.</p>
-</div>
+
 </div>
 </div>
 <div class="sect1">
-<h2 id="_1_get_the_source">1. Get the Source</h2>
+<h2 id="_scm_repository">SCM / Repository</h2>
 <div class="sectionbody">
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Checkout the source</p>
+<div class="paragraph">
+<p>We are using GIT as a Version Control System. The official GIT
+repository of the project is available
+<a href="https://git-wip-us.apache.org/repos/asf/deltaspike.git">here</a>.</p>
+</div>
+<div class="sect2">
+<h3 id="_initial_checkout">Initial 'checkout'</h3>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git</code></pre>
+<pre>git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git</pre>
 </div>
 </div>
-<div class="paragraph">
-<p>or for a read-only mirror version</p>
 </div>
+<div class="sect2">
+<h3 id="_update_existing_clone">Update existing clone</h3>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>git clone https://github.com/apache/deltaspike</code></pre>
+<pre>git pull --rebase</pre>
 </div>
 </div>
-</li>
-<li>
-<p>Update the repository clone</p>
+</div>
+<div class="sect2">
+<h3 id="_read_only_mirrors">Read-only Mirrors</h3>
+<div class="sect3">
+<h4 id="_github_mirror">GitHub-Mirror</h4>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>git pull --rebase</code></pre>
+<pre>git clone https://github.com/apache/deltaspike</pre>
 </div>
 </div>
-</li>
-</ol>
-</div>
+<div class="paragraph">
+<p>More information can be found <a href="https://help.github.com/articles/which-remote-url-should-i-use">here</a>.</p>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_2_make_additions_and_changes_to_the_source">2. Make Additions and Changes to the Source</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Commits (and in the best case also patches), have to follow our
-"formatting rules". The following section provides settings for IDEs
-used by us.</p>
 </div>
 <div class="sect2">
-<h3 id="_intellij">IntelliJ</h3>
+<h3 id="_git_workflow">GIT Workflow</h3>
 <div class="paragraph">
-<p><a href="http://deltaspike.apache.org/resources/files/settings.jar">Attached</a> you can find the settings
-for formatting the source code. Import them via File | Import
-Settings</p>
+<p>We follow an <a href="../suggested-git-workflows.html">unified GIT workflow</a> to
+keep the commit history straight and therefore simple and clean. General
+details about GIT at Apache are available
+<a href="http://wiki.apache.org/couchdb/Git_At_Apache_Guide">here</a> and at
+<a href="http://git-wip-us.apache.org" class="bare">http://git-wip-us.apache.org</a>.</p>
 </div>
+<div class="paragraph">
+<p><strong>Hint:</strong></p>
 </div>
-<div class="sect2">
-<h3 id="_eclipse">Eclipse</h3>
 <div class="paragraph">
-<p>For Eclipse you can use this
-<a href="http://deltaspike.apache.org/resources/files/deltaspike-code-conventions.xml">Code Formatter Profile</a>. Import it via Window | Preferences | Java | Code Style | Formatter</p>
+<p>If you are new to Git you might like to try the
+<a href="http://git.or.cz/course/svn.html">Git guide for subversion users</a> or have
+a look at the <a href="http://git-scm.com/book">Git community book</a>.</p>
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_3_build_the_source">3. Build the Source</h2>
+<h2 id="_build">Build</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Always build and test your changes before you make pull requests to the DeltaSpike repository. For instructions on building the source and running Arquillian tests, see <a href="build.html">Build and Test DeltaSpike from Source</a>.</p>
+<p>So now you probably want to <strong><code>build the code</code></strong>. So follow the
+instructions <a href="build.html">here</a></p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_4_make_a_pull_request">4. Make a Pull Request</h2>
+<h2 id="_tools_ide">Tools / IDE</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Ensure your commits and pull requests follow the our established <a href="https://deltaspike.apache.org/suggested-git-workflows.html">DeltaSpike GIT workflow</a>.</p>
+<p>Commits (and in the best case also patches), have to follow our
+"formatting rules". The following section provides settings for IDEs
+used by us.</p>
 </div>
+<div class="sect2">
+<h3 id="_intellij">IntelliJ</h3>
+<div class="paragraph">
+<p><a href="http://deltaspike.apache.org/resources/files/settings.jar">Attached</a> you can find the settings
+for formatting the source code. Import them via File | Import
+Settings&#8230;&#8203;</p>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_git_resources">Git Resources</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_eclipse">Eclipse</h3>
 <div class="paragraph">
-<p>For general information about Git and using Git, see the following:</p>
+<p>For Eclipse you can use this
+<a href="http://deltaspike.apache.org/resources/files/deltaspike-code-conventions.xml">Code Formatter Profile</a>. Import it via Window | Preferences | Java | Code Style | Formatter</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://wiki.apache.org/couchdb/Git_At_Apache_Guide">Git At Apache Guide</a></p>
-</li>
-<li>
-<p><a href="http://git-wip-us.apache.org">Git at The ASF</a></p>
-</li>
-<li>
-<p><a href="http://git.or.cz/course/svn.html">Git - SVN Crash Course</a></p>
-</li>
-<li>
-<p><a href="http://git-scm.com/book">Pro Git</a></p>
-</li>
-<li>
-<p><a href="https://help.github.com/articles/which-remote-url-should-i-use">GitHub: Which remote URL should I use?</a></p>
-</li>
-</ul>
 </div>
 </div>
 </div>

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/spi.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/spi.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->
@@ -171,6 +169,7 @@ body {
 
 				<div id="toc" class="toc">
        	 		<ul class="sectlevel1">
+<li><a href="#_introduction">Introduction</a></li>
 <li><a href="#_deactivatable">Deactivatable</a>
 <ul class="sectlevel2">
 <li><a href="#_classdeactivator">ClassDeactivator</a></li>
@@ -187,31 +186,51 @@ body {
 </ul>
        	 		<hr>	
        	 		
-				<div id="preamble">
+				<div class="sect1">
+<h2 id="_introduction">Introduction</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>DeltaSpike provides an Service Provider Interface (SPI) to enable you to extend it.</p>
-</div>
+
 </div>
 </div>
 <div class="sect1">
 <h2 id="_deactivatable">Deactivatable</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>This mechanism is only used for artifacts <strong>like</strong> implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which <strong>can&#8217;t</strong> be deactivated with std. CDI mechanisms.</p>
-</div>
-<div class="paragraph">
-<p>This interface is just a marker interface which is implemented by all pre-configured DeltaSpike artifacts which can be deactivated manually (e.g. to improve the performance if a part isn&#8217;t needed, to provide a custom implementation if the default implementation isn&#8217;t pluggable by default or to bypass an implementation which causes an issue (in this case please also <strong>contact us</strong> and we will fix it)).</p>
-</div>
-<div class="paragraph">
-<p>To deactivate a class it&#8217;s required to implement <code>ClassDeactivator</code>. Returning 'false' or 'true' allows to de-/activate the class in question. Retuning null means that the current class-deactivator doesn&#8217;t have information about the class in question and can&#8217;t provide a result. Since <code>ClassDeactivator</code> implementations are configured with the low-level config of DeltaSpike, the class-deactivator with the highest ordinal has the final decision. DeltaSpike itself doesn&#8217;t deactivate an implementation, however, an add-on or a 3rd party portable CDI extension based on DeltaSpike (Core+) can use the concept to deactivate a default implementation of DeltaSpike in favour of its own implementation.</p>
-</div>
-<div class="paragraph">
-<p><strong>Attention</strong>: due to the ordinal feature of the low-level config approach it&#8217;s possible that a class-deactivator with a higher ordinal, e.g. used in a concrete project, can re-activate a deactivated implementation.</p>
-</div>
-<div class="paragraph">
-<p><strong>Please note</strong> that you might have to deactivate the parts of the add-on or 3rd party CDI extension which relies on its own implementation. Therefore, you should <strong>be really careful with re-activation</strong>.) The implementation should be stateless because the result will be cached and
-as soon as everything is initialized the class-deactivators won&#8217;t be used any longer.</p>
+<p>This mechanism is only used for artifacts <strong>like</strong> implementations of
+(<code>javax.enterprise.inject.spi.Extension</code>) which <strong>can&#8217;t</strong> be deactivated
+with std. CDI mechanisms.</p>
+</div>
+<div class="paragraph">
+<p>This interface is just a marker interface which is implemented by all
+pre-configured DeltaSpike artifacts which can be deactivated manually
+(e.g. to improve the performance if a part isn&#8217;t needed, to provide a
+custom implementation if the default implementation isn&#8217;t pluggable by
+default or to bypass an implementation which causes an issue (in this
+case please also <strong>contact us</strong> and we will fix it)).</p>
+</div>
+<div class="paragraph">
+<p>To deactivate a class it&#8217;s required to implement <code>ClassDeactivator</code>.
+Returning 'false' or 'true' allows to de-/activate the class in
+question. Retuning null means that the current class-deactivator doesn&#8217;t
+have information about the class in question and can&#8217;t provide a result.
+Since <code>ClassDeactivator</code> implementations are configured with the
+low-level config of DeltaSpike, the class-deactivator with the highest
+ordinal has the final decision. DeltaSpike itself doesn&#8217;t deactivate an
+implementation, however, an add-on or a 3rd party portable CDI extension
+based on DeltaSpike (Core+) can use the concept to deactivate a default
+implementation of DeltaSpike in favour of its own implementation.</p>
+</div>
+<div class="paragraph">
+<p><strong>Attention</strong>: due to the ordinal feature of the low-level config
+approach it&#8217;s possible that a class-deactivator with a higher ordinal,
+e.g. used in a concrete project, can re-activate a deactivated
+implementation.<br>
+<strong>Please note</strong> that you might have to deactivate the parts of the add-on
+or 3rd party CDI extension which relies on its own implementation.
+Therefore, you should <strong>be really careful with re-activation</strong>.) The
+implementation should be stateless because the result will be cached and
+as soon as everything is initialized the class-deactivators won&#8217;t be
+used any longer.</p>
 </div>
 <div class="sect2">
 <h3 id="_classdeactivator">ClassDeactivator</h3>
@@ -236,7 +255,12 @@ as soon as everything is initialized the
 </div>
 </div>
 <div class="paragraph">
-<p>A class-deactivator will be resolved from the environment via the default resolvers or via a custom resolver which allows to use any type of configuration-format. (see <code>org.apache.deltaspike.core.api.config.ConfigResolver</code>). The key is the fully qualified name of the interface (<code>org.apache.deltaspike.core.spi.activation.ClassDeactivator</code>).</p>
+<p>A class-deactivator will be resolved from the environment via the
+default resolvers or via a custom resolver which allows to use any type
+of configuration-format. (see
+<code>org.apache.deltaspike.core.api.config.ConfigResolver</code>). The key is the
+fully qualified name of the interface
+(<code>org.apache.deltaspike.core.spi.activation.ClassDeactivator</code>).</p>
 </div>
 </div>
 </div>
@@ -264,7 +288,12 @@ as soon as everything is initialized the
 <h2 id="_global_alternative">Global Alternative</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>There are several application servers (using CDI 1.0) which can&#8217;t handle alternative CDI beans correctly (e.g. due to a too strict interpretation or a broken implementation). Therefore, DeltaSpike allows to use the std. <code>@Alternative</code> annotation and an additional config entry for DeltaSpike which allows to use the alternative implementation as a global alternative.</p>
+<p>There are several application servers (using CDI 1.0) which can&#8217;t handle
+alternative CDI beans correctly (e.g. due to a too strict interpretation
+or a broken implementation). Therefore, DeltaSpike allows to use the
+std. <code>@Alternative</code> annotation and an additional config entry for
+DeltaSpike which allows to use the alternative implementation as a
+global alternative.</p>
 </div>
 <div class="paragraph">
 <p><strong>Std. CDI alternative implementation (without the required XML config)</strong></p>
@@ -283,11 +312,15 @@ as soon as everything is initialized the
 </div>
 </div>
 <div class="paragraph">
-<p>Instead of configuring the alternative in the beans.xml, a global alternative needs to be configured in /META-INF/apache-deltaspike.properties. CDI 1.1 should fix this issue and migrating to it means to remove the config entry for DeltaSpike again and move to the std. CDI config approach.</p>
+<p>Instead of configuring the alternative in the beans.xml, a global
+alternative needs to be configured in
+/META-INF/apache-deltaspike.properties. CDI 1.1 should fix this issue
+and migrating to it means to remove the config entry for DeltaSpike
+again and move to the std. CDI config approach.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>custom.CustomBean=custom.AlternativeCustomBean</code></pre>
+<pre>custom.CustomBean=custom.AlternativeCustomBean</pre>
 </div>
 </div>
 </div>

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/steps_for_a_release.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->
@@ -174,19 +172,19 @@ body {
 <li><a href="#_preparations">Preparations</a></li>
 <li><a href="#_first_steps">First steps</a></li>
 <li><a href="#_vote">Vote</a>
-<ul class="sectlevel1">
+<ul class="sectlevel2">
 <li><a href="#_start_the_vote">Start the vote</a></li>
 </ul>
 </li>
 <li><a href="#_announce_the_vote">Announce the vote</a></li>
 <li><a href="#_perform_the_final_release">Perform the final release</a>
-<ul class="sectlevel1">
+<ul class="sectlevel2">
 <li><a href="#_close_the_vote">Close the vote</a></li>
 <li><a href="#_upload_artifacts">Upload artifacts</a></li>
 <li><a href="#_check_downloads">Check downloads</a></li>
 <li><a href="#_update_site_content">Update site content</a></li>
 <li><a href="#_announce_the_release">Announce the Release</a>
-<ul class="sectlevel2">
+<ul class="sectlevel3">
 <li><a href="#_e_mails">E-Mails</a></li>
 <li><a href="#_twitter">Twitter</a></li>
 </ul>
@@ -289,10 +287,11 @@ git push vote --tags</pre>
 </div>
 </div>
 </div>
-<h1 id="_vote" class="sect0">Vote</h1>
 <div class="sect1">
-<h2 id="_start_the_vote">Start the vote</h2>
+<h2 id="_vote">Vote</h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_start_the_vote">Start the vote</h3>
 <div class="paragraph">
 <p>e.g.:</p>
 </div>
@@ -330,7 +329,10 @@ Thanks,
 </div>
 </div>
 </div>
-<h1 id="_announce_the_vote" class="sect0">Announce the vote</h1>
+</div>
+<div class="sect1">
+<h2 id="_announce_the_vote">Announce the vote</h2>
+<div class="sectionbody">
 <div class="ulist">
 <ul>
 <li>
@@ -341,10 +343,13 @@ Thanks,
 </li>
 </ul>
 </div>
-<h1 id="_perform_the_final_release" class="sect0">Perform the final release</h1>
+</div>
+</div>
 <div class="sect1">
-<h2 id="_close_the_vote">Close the vote</h2>
+<h2 id="_perform_the_final_release">Perform the final release</h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_close_the_vote">Close the vote</h3>
 <div class="paragraph">
 <p>After 72 hours close the vote.</p>
 </div>
@@ -406,10 +411,8 @@ git push origin master</pre>
 </ul>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_upload_artifacts">Upload artifacts</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_upload_artifacts">Upload artifacts</h3>
 <div class="listingblock">
 <div class="content">
 <pre>svn co https://dist.apache.org/repos/dist/release/deltaspike
@@ -418,10 +421,8 @@ mkdir [version]
 </div>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_check_downloads">Check downloads</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_check_downloads">Check downloads</h3>
 <div class="ulist">
 <ul>
 <li>
@@ -433,10 +434,8 @@ mkdir [version]
 </ul>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_update_site_content">Update site content</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_update_site_content">Update site content</h3>
 <div class="paragraph">
 <p>via CMS:</p>
 </div>
@@ -454,12 +453,10 @@ mkdir [version]
 </ul>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_announce_the_release">Announce the Release</h2>
-<div class="sectionbody">
 <div class="sect2">
-<h3 id="_e_mails">E-Mails</h3>
+<h3 id="_announce_the_release">Announce the Release</h3>
+<div class="sect3">
+<h4 id="_e_mails">E-Mails</h4>
 <div class="listingblock">
 <div class="content">
 <pre>[ANNOUNCE] Release of Apache DeltaSpike [version]
@@ -499,8 +496,8 @@ Enjoy!
 </ul>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_twitter">Twitter</h3>
+<div class="sect3">
+<h4 id="_twitter">Twitter</h4>
 <div class="paragraph">
 <p>e.g.:</p>
 </div>
@@ -510,6 +507,7 @@ Enjoy!
 </div>
 </div>
 </div>
+</div>
 </div>
 </div>
 			</div>

Modified: websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html (original)
+++ websites/staging/deltaspike/trunk/content/staging/documentation/test-control.html Fri Dec 12 17:39:18 2014
@@ -134,21 +134,19 @@ body {
 					data-target=".nav-collapse"> <span class="icon-bar"></span> <span
 					class="icon-bar"></span> <span class="icon-bar"></span>
 				</a> <a class="brand logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
 				<div class="nav-collapse">
 					<ul class="nav">
 						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
+							href="index.html">Home</a></li>
+						<li><a href="../documentation">Documentation</a></li>
+						<li><a href="../javadoc.html">Javadoc</a></li>
+						<li><a href="../documentation/source.html">Source</a></li>
+						<li><a href="../download.html">Download</a></li>
+						<li><a href="../community.html">Community</a></li>
 						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
+						<li><a href="../news.html">News</a></li>
+						<li><a href="../migration-guide.html">Migration</a></li>
 					</ul>
 				</div>
 				<!--/.nav-collapse -->



Mime
View raw message