You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by bu...@apache.org on 2013/06/10 10:09:38 UTC
svn commit: r865101 - /websites/staging/deltaspike/trunk/content/
Author: buildbot
Date: Mon Jun 10 08:09:37 2013
New Revision: 865101
Log:
Staging update by buildbot for deltaspike
Modified:
websites/staging/deltaspike/trunk/content/ (props changed)
websites/staging/deltaspike/trunk/content/I18n.html
websites/staging/deltaspike/trunk/content/build.html
websites/staging/deltaspike/trunk/content/community.html
websites/staging/deltaspike/trunk/content/download.html
websites/staging/deltaspike/trunk/content/examples.html
websites/staging/deltaspike/trunk/content/exceptions.html
websites/staging/deltaspike/trunk/content/migration-guide.html
websites/staging/deltaspike/trunk/content/new-committer.html
websites/staging/deltaspike/trunk/content/news.html
websites/staging/deltaspike/trunk/content/project-name.html
websites/staging/deltaspike/trunk/content/release-preparation.html
websites/staging/deltaspike/trunk/content/source.html
websites/staging/deltaspike/trunk/content/spi.html
websites/staging/deltaspike/trunk/content/suggested-git-workflows.html
websites/staging/deltaspike/trunk/content/supporters.html
Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 10 08:09:37 2013
@@ -1 +1 @@
-1491266
+1491367
Modified: websites/staging/deltaspike/trunk/content/I18n.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/I18n.html (original)
+++ websites/staging/deltaspike/trunk/content/I18n.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,30 @@
<div class="page-title">
<h1>I18n</h1>
</div>
- <h2 id="type-safe-messages">Type-safe messages</h2>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#type-safe-messages">Type-safe messages</a><ul>
+<li><a href="#simple-use-case">Simple use-case</a></li>
+</ul>
+</li>
+<li><a href="#dynamic-message-builder">Dynamic Message Builder</a><ul>
+<li><a href="#creating-message-instances">Creating message instances</a></li>
+<li><a href="#customizing-the-message-context">Customizing the message context</a><ul>
+<li><a href="#messageresolver">MessageResolver</a></li>
+<li><a href="#messageinterpolator">MessageInterpolator</a></li>
+<li><a href="#localeresolver">LocaleResolver</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h2 id="type-safe-messages">Type-safe messages</h2>
<h3 id="simple-use-case">Simple use-case</h3>
<p>The following implementation is the minimal effort to use type-safe messages (which are hardcoded in this case).</p>
<p><strong>Simple type-safe message</strong></p>
Modified: websites/staging/deltaspike/trunk/content/build.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/build.html (original)
+++ websites/staging/deltaspike/trunk/content/build.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,32 @@
<div class="page-title">
<h1>Building DeltaSpike from source</h1>
</div>
- <p>Deltaspike uses <a href="http://maven.apache.org/">maven</a> build tool to automate the compilation, testing and packaging of the project</p>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#full-build">Full build</a></li>
+<li><a href="#build-with-test">Build with test</a></li>
+<li><a href="#build-example">Build example</a></li>
+<li><a href="#integration-tests">Integration Tests</a><ul>
+<li><a href="#tomee">TomEE</a></li>
+<li><a href="#jbossas7">JBossAS7</a><ul>
+<li><a href="#without-existing-as7">Without existing AS7</a></li>
+<li><a href="#with-existing-as7">With existing AS7</a></li>
+</ul>
+</li>
+<li><a href="#glassfish-31">GlassFish 3.1</a></li>
+<li><a href="#weblogic-12c">WebLogic 12c</a></li>
+</ul>
+</li>
+<li><a href="#jenkins-builds">Jenkins Builds</a></li>
+<li><a href="#sonar">Sonar</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<p>Deltaspike uses <a href="http://maven.apache.org/">maven</a> build tool to automate the compilation, testing and packaging of the project</p>
<h2 id="full-build">Full build</h2>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span>
</pre></div>
Modified: websites/staging/deltaspike/trunk/content/community.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/community.html (original)
+++ websites/staging/deltaspike/trunk/content/community.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,24 @@
<div class="page-title">
<h1>Community</h1>
</div>
- <h1 id="users">Users</h1>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#users">Users</a></li>
+<li><a href="#getting-involved">Getting Involved</a><ul>
+<li><a href="#contributors">Contributors</a></li>
+<li><a href="#committers">Committers</a></li>
+</ul>
+</li>
+<li><a href="#mailing-lists">Mailing lists</a></li>
+<li><a href="#jira">JIRA</a></li>
+<li><a href="#spread-the-word">Spread the word</a></li>
+<li><a href="#irc">IRC</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h1 id="users">Users</h1>
<p>If you are a new user and you would like to start using DeltaSpike, you can have a look at the <a href="documentation.html">Documentation</a> and <a href="mailto:users-subscribe@deltaspike.apache.org">subscribe</a> our <a href="mailto:users@deltaspike.apache.org">mailing list for users</a>.
If you have troubles to find the information you are looking for, you can also ask in our <a href="#IRC">IRC-Channel</a>.</p>
<p>Furthermore, you can check our <a href="#mailing-lists">mail-archives</a>.</p>
Modified: websites/staging/deltaspike/trunk/content/download.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/download.html (original)
+++ websites/staging/deltaspike/trunk/content/download.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,15 @@
<div class="page-title">
<h1>Download</h1>
</div>
- <h1 id="latest-releases">Latest Releases</h1>
+ <div class="toc">
+<ul>
+<li><a href="#latest-releases">Latest Releases</a></li>
+<li><a href="#binary-distribution">Binary Distribution</a></li>
+<li><a href="#source-distribution">Source Distribution</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="latest-releases">Latest Releases</h1>
<p>TBD</p>
<h1 id="binary-distribution">Binary Distribution</h1>
<p>TBD</p>
Modified: websites/staging/deltaspike/trunk/content/examples.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/examples.html (original)
+++ websites/staging/deltaspike/trunk/content/examples.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,18 @@
<div class="page-title">
<h1>Examples</h1>
</div>
- <h2 id="1">#1</h2>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#1">#1</a></li>
+</ul>
+</li>
+<li><a href="#external">External</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h2 id="1">#1</h2>
<p>artifact-id: deltaspike-jse-owb-example
(the shown use-cases also work with <em>Weld</em> - only the bootstrapping of the container is different, because this example is based on Java-SE and therefore outside of an Java-EE(6+) application server.</p>
<h1 id="external">External</h1>
Modified: websites/staging/deltaspike/trunk/content/exceptions.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/exceptions.html (original)
+++ websites/staging/deltaspike/trunk/content/exceptions.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,34 @@
<div class="page-title">
<h1>Exception Handling</h1>
</div>
- <p>Exception handling in DeltaSpike is based around the CDI eventing model. While
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#exception-handling-usage">Exception Handling - Usage</a><ul>
+<li><a href="#eventing-into-the-exception-handling-framework">Eventing into the exception handling framework</a></li>
+</ul>
+</li>
+<li><a href="#exception-handlers">Exception handlers</a><ul>
+<li><a href="#exception-handler-annotations">Exception handler annotations</a><ul>
+<li><a href="#exceptionhandler">{{@ExceptionHandler}}</a></li>
+<li><a href="#handles-and-beforehandles">{{@Handles}} and {{@BeforeHandles}}</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#exception-chain-processing">Exception Chain Processing</a></li>
+<li><a href="#handler-ordinal">Handler ordinal</a></li>
+<li><a href="#apis-for-exception-information-and-flow-control">APIs for exception information and flow control</a><ul>
+<li><a href="#exceptionevent">ExceptionEvent</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<p>Exception handling in DeltaSpike is based around the CDI eventing model. While
the implementation of exception handlers may not be the same as a CDI event, and
the programming model is not exactly the same as specifying a CDI event /
observer, the concepts are very similar. DeltaSpike makes use of events for many of
Modified: websites/staging/deltaspike/trunk/content/migration-guide.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/migration-guide.html (original)
+++ websites/staging/deltaspike/trunk/content/migration-guide.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,45 @@
<div class="page-title">
<h1>Migrate from MyFaces CODI-Core to DeltaSpike</h1>
</div>
- <h1 id="apache-myfaces-codi-to-apache-deltaspike">Apache MyFaces CODI to Apache DeltaSpike</h1>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#apache-myfaces-codi-to-apache-deltaspike">Apache MyFaces CODI to Apache DeltaSpike</a><ul>
+<li><a href="#basically-unchanged-parts">Basically unchanged parts</a><ul>
+<li><a href="#project-stage">Project-stage</a></li>
+<li><a href="#deactivatable-and-classdeactivator">Deactivatable and ClassDeactivator</a></li>
+<li><a href="#codiconfig">CodiConfig</a></li>
+<li><a href="#annotation-literals">Annotation literals</a></li>
+<li><a href="#beanmanagerprovider">BeanManagerProvider</a></li>
+</ul>
+</li>
+<li><a href="#extended-concepts">Extended concepts</a><ul>
+<li><a href="#configuredvalueresolver">ConfiguredValueResolver</a></li>
+<li><a href="#projectstageactivated-and-expressionactivated">ProjectStageActivated and ExpressionActivated</a></li>
+<li><a href="#defaultannotation">DefaultAnnotation</a></li>
+</ul>
+</li>
+<li><a href="#postponed-concepts">Postponed concepts</a><ul>
+<li><a href="#beannames">BeanNames</a></li>
+</ul>
+</li>
+<li><a href="#dropped-concepts">Dropped concepts</a><ul>
+<li><a href="#java-15-support">Java 1.5 Support</a></li>
+</ul>
+</li>
+<li><a href="#jsf-module">JSF Module</a><ul>
+<li><a href="#type-safe-view-config">Type-safe view config</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#jboss-seam2-to-apache-deltaspike">JBoss Seam2 to Apache DeltaSpike</a></li>
+<li><a href="#jboss-seam3-to-apache-deltaspike">JBoss Seam3 to Apache DeltaSpike</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h1 id="apache-myfaces-codi-to-apache-deltaspike">Apache MyFaces CODI to Apache DeltaSpike</h1>
<h2 id="basically-unchanged-parts">Basically unchanged parts</h2>
<p>Here you can see features which were added and the concept itself didn't change (only the packages, config keys,...)</p>
<h3 id="project-stage">Project-stage</h3>
Modified: websites/staging/deltaspike/trunk/content/new-committer.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/new-committer.html (original)
+++ websites/staging/deltaspike/trunk/content/new-committer.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,21 @@
<div class="page-title">
<h1>New Committer</h1>
</div>
- <h2 id="invitation-to-become-a-project-committer">Invitation to become a project Committer</h2>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#invitation-to-become-a-project-committer">Invitation to become a project Committer</a></li>
+</ul>
+</li>
+<li><a href="#pmc">PMC</a><ul>
+<li><a href="#votes">Votes</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h2 id="invitation-to-become-a-project-committer">Invitation to become a project Committer</h2>
<p>If a person contributes an sufficient amount of code or documentation to our project she might get picked up as a committer to our project.
As soon as the PMC is confident that you are a great addition to the team, one of the PMC members start will start an internal DISCUSS thread and later on an internal VOTE.</p>
<h1 id="pmc">PMC</h1>
Modified: websites/staging/deltaspike/trunk/content/news.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/news.html (original)
+++ websites/staging/deltaspike/trunk/content/news.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,40 @@
<div class="page-title">
<h1>Apache DeltaSpike News</h1>
</div>
- <h2 id="3rd-release-03-incubating-22082012">3rd Release (0.3 incubating) (22.08.2012)</h2>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#3rd-release-03-incubating-22082012">3rd Release (0.3 incubating) (22.08.2012)</a></li>
+<li><a href="#new-committer-21082012">New Committer (21.08.2012)</a></li>
+<li><a href="#new-committers-11072012">New Committers (11.07.2012)</a></li>
+<li><a href="#apache-cms-30052012">Apache CMS (30.05.2012)</a></li>
+<li><a href="#2nd-release-02-incubating-22042012">2nd Release (0.2 incubating) (22.04.2012)</a></li>
+<li><a href="#1st-release-01-incubating-10022012">1st Release (0.1 incubating) (10.02.2012)</a></li>
+<li><a href="#execution-of-integration-tests-with-remote-servers-01022012">Execution of integration tests with remote servers (01.02.2012)</a></li>
+<li><a href="#new-committer-29012012">New Committer (29.01.2012)</a></li>
+<li><a href="#new-committer-28012012">New Committer (28.01.2012)</a></li>
+<li><a href="#new-committer-27012012">New Committer (27.01.2012)</a></li>
+<li><a href="#nabble-mirror-21012012">Nabble Mirror (21.01.2012)</a></li>
+<li><a href="#new-committers-13012012">New Committers (13.01.2012)</a></li>
+<li><a href="#github-mirror-12012012">GitHub Mirror (12.01.2012)</a></li>
+<li><a href="#creation-of-the-status-page-30122011">Creation of the Status Page (30.12.2011)</a></li>
+<li><a href="#nightly-builds-29122011">Nightly builds (29.12.2011)</a></li>
+<li><a href="#sonar-build-29122011">Sonar build (29.12.2011)</a></li>
+<li><a href="#first-commit-22122011">First Commit (22.12.2011)</a></li>
+<li><a href="#first-jira-ticket-13122011">First JIRA ticket (13.12.2011)</a></li>
+<li><a href="#first-report-122011-12122011">First report 12.2011 (12.12.2011)</a></li>
+<li><a href="#twitter-account">Twitter Account</a></li>
+<li><a href="#mailing-lists-8122011">Mailing-lists (8.12.2011)</a></li>
+<li><a href="#vote-closed-7122011">Vote closed (7.12.2011)</a></li>
+<li><a href="#vote-to-join-the-incubator-4122011">Vote to join the Incubator (4.12.2011)</a></li>
+<li><a href="#proposal-30112011">Proposal (30.11.2011)</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h2 id="3rd-release-03-incubating-22082012">3rd Release (0.3 incubating) (22.08.2012)</h2>
<p>The Apache DeltaSpike team is pleased to announce the second release (v0.3-incubating).</p>
<p>The <a href="http://s.apache.org/DeltaSpike_03incubating">release notes</a> contains 104 JIRA tickets.</p>
<h2 id="new-committer-21082012">New Committer (21.08.2012)</h2>
Modified: websites/staging/deltaspike/trunk/content/project-name.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/project-name.html (original)
+++ websites/staging/deltaspike/trunk/content/project-name.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,15 @@
<div class="page-title">
<h1>Where the name 'DeltaSpike' comes from</h1>
</div>
- <p>Originally we agreed on Spike because it's a first-/nick-name and it's "related" to dependency injection. However, due to an existing trademark (see http://www.trademarkia.com) we can't use it. Since the projects aims to close different types of gaps, the name DeltaSpike came up.
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#existing-suggestions">Existing Suggestions</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<p>Originally we agreed on Spike because it's a first-/nick-name and it's "related" to dependency injection. However, due to an existing trademark (see http://www.trademarkia.com) we can't use it. Since the projects aims to close different types of gaps, the name DeltaSpike came up.
However, it's just the code-name during incubation to get started and we are looking for a new fancy name. The best choice would be an invented word (like Hadoop did).</p>
<p><em>You are welcome to add further suggestions or post them to our mailing list.</em></p>
<h1 id="existing-suggestions">Existing Suggestions</h1>
Modified: websites/staging/deltaspike/trunk/content/release-preparation.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/release-preparation.html (original)
+++ websites/staging/deltaspike/trunk/content/release-preparation.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,14 @@
<div class="page-title">
<h1>Reviewing an Apache Release</h1>
</div>
- <p>Once a Release has been staged on <a href="http://repository.apache.org">http://repository.apache.org</a> it must be reviewed by each PMC member <strong>before</strong> casting his VOTE.</p>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<p>Once a Release has been staged on <a href="http://repository.apache.org">http://repository.apache.org</a> it must be reviewed by each PMC member <strong>before</strong> casting his VOTE.</p>
<p>The following points need to be checked:</p>
<ul>
<li>is the GPG signature fine?</li>
Modified: websites/staging/deltaspike/trunk/content/source.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/source.html (original)
+++ websites/staging/deltaspike/trunk/content/source.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,30 @@
<div class="page-title">
<h1>Get Source and compile it</h1>
</div>
- <h1 id="vcs-repository">VCS / Repository</h1>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#scm-repository">SCM / Repository</a><ul>
+<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>
+<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>
+<li><a href="#intellij">IntelliJ</a></li>
+<li><a href="#eclipse">Eclipse</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h1 id="scm-repository">SCM / Repository</h1>
<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>
<h3 id="initial-checkout">Initial 'checkout'</h3>
<div class="codehilite"><pre><span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">deltaspike</span><span class="p">.</span><span class="n">git</span>
Modified: websites/staging/deltaspike/trunk/content/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/spi.html (original)
+++ websites/staging/deltaspike/trunk/content/spi.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,25 @@
<div class="page-title">
<h1>DeltaSpike Service Provider Interface (SPI)</h1>
</div>
- <h1 id="deactivatable">Deactivatable</h1>
+ <div class="toc">
+<ul>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#deactivatable">Deactivatable</a><ul>
+<li><a href="#classdeactivator">ClassDeactivator</a></li>
+</ul>
+</li>
+<li><a href="#configsource">ConfigSource</a><ul>
+<li><a href="#configsourceprovider">ConfigSourceProvider</a></li>
+<li><a href="#baseconfigpropertyproducer">BaseConfigPropertyProducer</a></li>
+</ul>
+</li>
+<li><a href="#interceptorstrategy">InterceptorStrategy</a></li>
+<li><a href="#global-alternative">Global Alternative</a></li>
+</ul>
+</div>
+<hr />
+<h1 id="introduction">Introduction</h1>
+<h1 id="deactivatable">Deactivatable</h1>
<p>This mechanism is only used for artifacts <strong>like</strong> implementations of (<code>javax.enterprise.inject.spi.Extension</code>) which <strong>can't</strong> be deactivated with std. CDI mechanisms.</p>
<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't needed, to provide a custom implementation if the default implementation isn'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>
<p>To deactivate a class it's required to implement <code>ClassDeactivator</code>. Returning 'false' or 'true' allows to de-/activate the class in question.
Modified: websites/staging/deltaspike/trunk/content/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/suggested-git-workflows.html (original)
+++ websites/staging/deltaspike/trunk/content/suggested-git-workflows.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,26 @@
<div class="page-title">
<h1></h1>
</div>
- <h1 id="suggested-workflows">Suggested workflows</h1>
+ <div class="toc">
+<ul>
+<li><a href="#suggested-git-workflows">Suggested GIT workflows</a><ul>
+<li><a href="#avoid-git-pull">Avoid git-pull!</a></li>
+<li><a href="#git-pull-rebase">git pull --rebase</a><ul>
+<li><a href="#working-in-an-own-branch">Working in an own branch</a></li>
+</ul>
+</li>
+<li><a href="#contribution-workflow">Contribution workflow</a><ul>
+<li><a href="#creating-patches">Creating patches</a></li>
+<li><a href="#applying-patches">Applying patches</a></li>
+</ul>
+</li>
+<li><a href="#discussion-workflow-optional">Discussion workflow (optional)</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="suggested-git-workflows">Suggested GIT workflows</h1>
<h2 id="avoid-git-pull">Avoid git-pull!</h2>
<p>git-pull should never get invoked if you have dirty files lying around or if your branch is ahead of master.
This will always lead to some dirty artifacts in the commit history:</p>
Modified: websites/staging/deltaspike/trunk/content/supporters.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/supporters.html (original)
+++ websites/staging/deltaspike/trunk/content/supporters.html Mon Jun 10 08:09:37 2013
@@ -78,7 +78,18 @@
<div class="page-title">
<h1>DeltaSpike supporters</h1>
</div>
- <h1 id="support-deltaspike">Support DeltaSpike</h1>
+ <div class="toc">
+<ul>
+<li><a href="#support-deltaspike">Support DeltaSpike</a><ul>
+<li><a href="#git-mirrors">Git Mirrors</a></li>
+<li><a href="#mailing-list-mirrors">Mailing-list Mirrors</a></li>
+<li><a href="#integration-tests">(Integration) Tests</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="support-deltaspike">Support DeltaSpike</h1>
<p>Apache DeltaSpike gets support from many community members.</p>
<h2 id="git-mirrors">Git Mirrors</h2>
<p>Besides the official GitHub mirror there are the following mirrors:</p>