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 2012/07/03 18:09:45 UTC

svn commit: r824251 [1/3] - in /websites/staging/deltaspike/trunk/content: ./ deltaspike/ deltaspike/resources/

Author: buildbot
Date: Tue Jul  3 16:09:36 2012
New Revision: 824251

Log:
Staging update by buildbot for deltaspike

Added:
    websites/staging/deltaspike/trunk/content/deltaspike/backlog.html
    websites/staging/deltaspike/trunk/content/deltaspike/cdi-1.1-proposals.html
    websites/staging/deltaspike/trunk/content/deltaspike/community.html
    websites/staging/deltaspike/trunk/content/deltaspike/exception_draft.html
    websites/staging/deltaspike/trunk/content/deltaspike/getting-involved.html
    websites/staging/deltaspike/trunk/content/deltaspike/migration-guide.html
    websites/staging/deltaspike/trunk/content/deltaspike/news.html
    websites/staging/deltaspike/trunk/content/deltaspike/project-name.html
    websites/staging/deltaspike/trunk/content/deltaspike/project-structure.html
    websites/staging/deltaspike/trunk/content/deltaspike/release-preparation.html
    websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html
    websites/staging/deltaspike/trunk/content/deltaspike/supporters.html
    websites/staging/deltaspike/trunk/content/deltaspike/tools.html
Modified:
    websites/staging/deltaspike/trunk/content/   (props changed)
    websites/staging/deltaspike/trunk/content/deltaspike/I18.html
    websites/staging/deltaspike/trunk/content/deltaspike/build.html
    websites/staging/deltaspike/trunk/content/deltaspike/examples.html
    websites/staging/deltaspike/trunk/content/deltaspike/exceptions.html
    websites/staging/deltaspike/trunk/content/deltaspike/features.html
    websites/staging/deltaspike/trunk/content/deltaspike/getting-started.html
    websites/staging/deltaspike/trunk/content/deltaspike/index.html
    websites/staging/deltaspike/trunk/content/deltaspike/integration-tests.html
    websites/staging/deltaspike/trunk/content/deltaspike/irc.html
    websites/staging/deltaspike/trunk/content/deltaspike/jpa.html
    websites/staging/deltaspike/trunk/content/deltaspike/resources/site.css
    websites/staging/deltaspike/trunk/content/deltaspike/security.html
    websites/staging/deltaspike/trunk/content/deltaspike/source.html
    websites/staging/deltaspike/trunk/content/deltaspike/spi.html

Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul  3 16:09:36 2012
@@ -1 +1 @@
-1356712
+1356808

Modified: websites/staging/deltaspike/trunk/content/deltaspike/I18.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/I18.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/I18.html Tue Jul  3 16:09:36 2012
@@ -22,7 +22,7 @@ under the License.
     <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
     <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
-    <title>Apache DeltaSpike - </title>
+    <title>Apache DeltaSpike - I18n</title>
 
     
 
@@ -31,12 +31,12 @@ under the License.
 </head>
 <body>
 <div id="page" class="container_16">
-        <div id="header" class="grid_7 alpha">
+        <div id="header" class="grid_8 alpha">
             <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
             <span id="projectname">Apache DeltaSpike</span>
         </div>
 
-        <div id="nav" class="grid_9 omega">
+        <div id="nav" class="grid_8 omega">
             <ul>
                 <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
                 <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
@@ -61,9 +61,8 @@ under the License.
         <hr/>
 
     <div id="content-wrapper" class="container_16">
-        <h1></h1>
-        <h1 id="i18n">I18n</h1>
-<h2 id="type-safe-messages">Type-safe messages</h2>
+        <h1>I18n</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>
 <div class="codehilite"><pre><span class="n">Simple</span> <span class="n">type</span><span class="o">-</span><span class="n">safe</span> <span class="n">message</span>

Added: websites/staging/deltaspike/trunk/content/deltaspike/backlog.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/backlog.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/backlog.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,167 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+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.
+-->
+<html>
+<head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
+    <title>Apache DeltaSpike - Backlog</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. -->
+</head>
+<body>
+<div id="page" class="container_16">
+        <div id="header" class="grid_8 alpha">
+            <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
+            <span id="projectname">Apache DeltaSpike</span>
+        </div>
+
+        <div id="nav" class="grid_8 omega">
+            <ul>
+                <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
+                <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
+                <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
+                <li><a href="http://people.apache.org" title="The People">People</a></li>
+                <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
+            </ul>
+        </div>
+        <hr/>
+        <div class="grid_8">
+            <p id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/deltaspike/">Deltaspike</a></p>
+        </div>
+
+        <div id="dsearch" class="grid_8">
+            <form name="search" id="search" action="http://www.google.com/search" method="get">
+                <input value="incubator.apache.org/deltaspike/" name="sitesearch" type="hidden"/>
+                <input type="text" name="q" id="query">
+                <input type="submit" id="submit" value="Search">
+            </form>
+        </div>
+        <hr/>
+
+    <div id="content-wrapper" class="container_16">
+        <h1>Backlog</h1>
+        <h1 id="deltaspike-forge-plugin">DeltaSpike-Forge Plugin</h1>
+<h2 id="possible-setup-for-v01">Possible Setup for v0.1</h2>
+<ul>
+<li>Project-Setup</li>
+<li>Deactivate DeltaSpike Features
+   <strong> Deactivate @Exclude extension
+   </strong> List deactivatable classes
+   <strong> Deactivate class
+   </strong> Re-activate class</li>
+<li>Project-Stage
+   <strong> Show current project-stage
+   </strong> Show project-stage key
+   <strong> Show how to set the project stage
+   </strong> Create custom project-stage</li>
+<li>Low-Level Config
+   <strong> Simulate property-lookup
+   </strong> Show config-sources
+   ** Create custom config-source</li>
+<li>Config
+   ** List all DeltaSpikeConfig implementations</li>
+</ul>
+<h1 id="osgi-integration">OSGI integration</h1>
+<p>Could be nice to be able to get OSGi services injected. A proposal is here: https://gist.github.com/1515423</p>
+<p>Bundle and BundleContext could be injectable too.</p>
+<p>A bundlelistener and a servicelistener could send CDI event to notify of OSGi states.</p>
+<h1 id="spring-cdi-integration">Spring CDI Integration</h1>
+<h2 id="seam-spring"><em>Seam Spring</em></h2>
+<h3 id="existing-features-as-of-seam-spring-31"><em>Existing features (as of Seam Spring 3.1)</em></h3>
+<table>
+<thead>
+<tr>
+<th></th>
+<th>Feature &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</th>
+<th></th>
+<th>"Requires" changes</th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>[Access to Spring web application context</td>
+<td>http://docs.jboss.org/seam/3/spring/latest/reference/en-US/html/spring-usage.html#d0e92]&nbsp; \</td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>(@Produce @Web @SpringContext)</td>
+<td>n</td>
+<td>10</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>[Exposure of Spring beans as CDI beans&nbsp;(availability for injection)</td>
+<td>http://docs.jboss.org/seam/3/spring/latest/reference/en-US/html/spring-usage.html#d0e92]\</td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>(resource locator pattern - @Produce @SpringBean )</td>
+<td>n</td>
+<td>10</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>[Exposure of CDI beans as Spring beans (and availability for injection)</td>
+<td>http://docs.jboss.org/seam/3/spring/latest/reference/en-US/html/spring-usage.html#d0e257]\</td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>(FactoryBean and namespace support)</td>
+<td>n</td>
+<td>10</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Bean Manager accessor - to be migrated to DeltaSpike facilities</td>
+<td>n</td>
+<td>10</td>
+<td></td>
+<td></td>
+</tr>
+</tbody>
+</table>
+<h3 id="planned-features">Planned features</h3>
+<p>From the [module site|http://seamframework.org/Seam3/SpringModule] , as well as new</p>
+<p>|| Feature &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; || "Requires" changes || Ranking || Objections ||
+| CDI eventing/Spring eventing bridge | n/a | 8 | |
+| Spring aspect/CDI interceptors bridge\ | n/a \ | 8 \ | |</p>
+
+    </div>
+</div>
+<div id="copyright" class="container_16">
+    <p>Copyright &#169; 20011-2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</body>
+</html>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/build.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/build.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/build.html Tue Jul  3 16:09:36 2012
@@ -22,7 +22,7 @@ under the License.
     <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
     <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
-    <title>Apache DeltaSpike - </title>
+    <title>Apache DeltaSpike - Building DeltaSpike from source</title>
 
     
 
@@ -31,12 +31,12 @@ under the License.
 </head>
 <body>
 <div id="page" class="container_16">
-        <div id="header" class="grid_7 alpha">
+        <div id="header" class="grid_8 alpha">
             <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
             <span id="projectname">Apache DeltaSpike</span>
         </div>
 
-        <div id="nav" class="grid_9 omega">
+        <div id="nav" class="grid_8 omega">
             <ul>
                 <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
                 <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
@@ -61,9 +61,8 @@ under the License.
         <hr/>
 
     <div id="content-wrapper" class="container_16">
-        <h1></h1>
-        <h1 id="building-deltaspike-from-source">Building DeltaSpike from source</h1>
-<p>Deltaspike uses <a href="">maven</a> build tool to automate the compilation, testing and packaging of the project</p>
+        <h1>Building DeltaSpike from source</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/cdi-1.1-proposals.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/cdi-1.1-proposals.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/cdi-1.1-proposals.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,788 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+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.
+-->
+<html>
+<head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
+    <title>Apache DeltaSpike - porposed CDI-1.1 enhancements</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. -->
+</head>
+<body>
+<div id="page" class="container_16">
+        <div id="header" class="grid_8 alpha">
+            <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
+            <span id="projectname">Apache DeltaSpike</span>
+        </div>
+
+        <div id="nav" class="grid_8 omega">
+            <ul>
+                <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
+                <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
+                <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
+                <li><a href="http://people.apache.org" title="The People">People</a></li>
+                <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
+            </ul>
+        </div>
+        <hr/>
+        <div class="grid_8">
+            <p id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/deltaspike/">Deltaspike</a></p>
+        </div>
+
+        <div id="dsearch" class="grid_8">
+            <form name="search" id="search" action="http://www.google.com/search" method="get">
+                <input value="incubator.apache.org/deltaspike/" name="sitesearch" type="hidden"/>
+                <input type="text" name="q" id="query">
+                <input type="submit" id="submit" value="Search">
+            </form>
+        </div>
+        <hr/>
+
+    <div id="content-wrapper" class="container_16">
+        <h1>porposed CDI-1.1 enhancements</h1>
+        <p>This page contains proposals of the DeltaSpike community for CDI 1.1. Some parts might be used also for DeltaSpike for CDI 1.0.</p>
+<h1 id="context-management-with-community-agreement">Context Management (with community agreement)</h1>
+<div class="codehilite"><pre><span class="n">public</span> <span class="n">interface</span> <span class="n">ManagedContext</span> <span class="n">extends</span> <span class="n">Context</span>
+<span class="p">{</span>
+    <span class="n">void</span> <span class="n">start</span><span class="p">();</span>
+
+    <span class="n">void</span> <span class="n">stop</span><span class="p">();</span>
+<span class="p">}</span>
+</pre></div>
+
+
+<p>[TODO]</p>
+<h2 id="context-management-of-weld-core-api">Context Management of Weld-Core (API)</h2>
+<p>A set of dependent scoped built in beans are available for context management.</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * Lifecycle management for built in contexts. {@link ManagedContext} only
+ * allows a context to be activated, deactivated and destroyed. It does not
+ * allow the context to be associated with an underlying data store. These
+ * operations are defined on {@link BoundContext}.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI provides a number of managed contexts: {@link SessionContext},
+ * {@link ConversationContext}, {@link RequestContext}. All these managed
+ * contexts are scoped to the thread, and propagation of the backing store
+ * between threads is the responsibility of the managed context user.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * @see BoundContext
+ *
+ */
+public interface ManagedContext extends Context {
+
+   /**
+    * Activate the Context.
+    */
+   public void activate();
+
+   /**
+    * Deactivate the Context, destroying any instances if the context is invalid.
+    */
+   public void deactivate();
+
+   /**
+    * Mark the context as due for destruction when deactivate is called.
+    */
+   public void invalidate();
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * Allows a thread-based context to be bound to some external instance storage
+ * (such as an HttpSession).
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * A context may be <span class="nt">&lt;em&gt;</span>detachable<span class="nt">&lt;/em&gt;</span> in which case a call to
+ * {@link ManagedContext#invalidate()} will detach the context from it&#39;s
+ * associated storage. A detached context is still usable (instances may be
+ * added or removed) however changes will not be written through to the
+ * underlying data store.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * Normally, a detachable context will have it&#39;s underlying bean store attached
+ * on a call to {@link ManagedContext#activate()} and detached on a call to
+ * {@link ManagedContext#deactivate()} however a subtype of {@link BoundContext}
+ * may change this behavior.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * If you call {@link #associate(Object)} you must ensure that you call
+ * {@link #dissociate(Object)} in all cases, otherwise you risk memory leaks.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * @param <span class="nt">&lt;S&gt;</span> the type of the external instance storage
+ * @see ManagedContext
+ */
+public interface BoundContext<span class="nt">&lt;S&gt;</span> extends Context {
+
+   /**
+    * Associate the context with the storage (for this thread). Once
+    * {@link #associate(Object)} has been called, further calls to
+    * {@link #associate(Object)} will be ignored, until the context has been
+    * subsequently {@link #dissociate(Object)} from the storage.
+    *
+    * @param storage the external storage
+    * @return true if the storage was attached, otherwise false
+    */
+   public boolean associate(S storage);
+
+   /**
+    * Dissociate the context from the storage (for this thread). The context
+    * will only dissociate from the same storage it associated with.
+    *
+    * @param storage the external storage
+    * @return true if the storage was dissociated
+    */
+   public boolean dissociate(S storage);
+
+}
+
+/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in dependent context, associated with {@link Dependent}. It is
+ * always active.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * There is one Dependent context which can be injected using:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject DependentContext dependentContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ */
+public interface DependentContext extends Context { }
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in request context is associated with {@link RequestScoped} and is
+ * a managed context which can be activated, invalidated and deactivated.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI comes with one implementation of the request context. The
+ * {@link HttpRequestContext}, in which conversations are bound to the
+ * {@link ServletRequest}, can be injected:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject <span class="err">&amp;</span>#064Http RequestContext requestContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ * @see HttpRequestContext
+ * @see RequestScoped
+ *
+ */
+public interface RequestContext extends ManagedContext {}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in session context is associated with {@link SessionScoped}. It can
+ * be activated, invalidated and deactivated.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI comes with one implementation of the session context. The
+ * {@link HttpSessionContext}, in which conversations are bound to the
+ * {@link HttpSession}, can be injected:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject <span class="err">&amp;</span>#064Http SessionContext sessionContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ * @see HttpSessionContext
+ * @sees {@link SessionScoped}
+ *
+ */
+public interface SessionContext extends ManagedContext {}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in application context, associated with {@link ApplicationScoped}.
+ * It is always active (not managed) and is backed by an application scoped
+ * singleton.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI comes with one Application context which can be injected using:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject ApplicationContext applicationContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ * @see SingletonContext
+ * @see ApplicationScoped
+ *
+ */
+public interface ApplicationContext extends Context {
+
+   /**
+    * Invalidate the context, causing all bean instances to be destroyed.
+    */
+   public void invalidate();
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in singleton context, associated with {@link Singleton}.
+ * It is always active (not managed) and is backed by an application scoped
+ * singleton.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI comes with one Singleton context which can be injected using:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject SingletonContext singletonContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ * @author Pete Muir
+ * @see SingletonContext
+ * @see ApplicationScoped
+ *
+ */
+public interface SingletonContext extends Context {}
+</pre></div>
+
+
+<p>And these HTTP backed implementations:</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A request context which can be bound to the {@link ServletRequest}. The
+ * context is automatically attached to the map on activation, and detached when
+ * {@link #invalidate()} is called.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * This context is not thread safe, and provides no thread safety for the
+ * underlying map.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ */
+public interface HttpRequestContext extends BoundContext<span class="nt">&lt;ServletRequest&gt;</span>, RequestContext {}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A session context which can be bound to the {@link HttpServletRequest}. The
+ * context is automatically attached to the map on activation, and detached when
+ * {@link #invalidate()} is called.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * This context is not thread safe, and provides no thread safety for the
+ * underlying map.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ */
+public interface HttpSessionContext extends BoundContext<span class="nt">&lt;HttpServletRequest&gt;</span>, SessionContext
+{
+
+   /**
+    * <span class="nt">&lt;p&gt;</span>
+    * Mark the Session Context for destruction; the Session Context will be
+    * detached from the underling Http Session, and instances marked for
+    * destruction when the Http Request is destroyed.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    */
+   public void invalidate();
+
+   /**
+    * <span class="nt">&lt;p&gt;</span>
+    * Destroy the session and all conversations stored in the session.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * <span class="nt">&lt;p&gt;</span>
+    * If the context is not currently associated with a
+    * {@link HttpServletRequest}, then the context will be associated with the
+    * specified {@link HttpSession} (for this thread), activated, destroyed, and
+    * then deactivated.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * <span class="nt">&lt;p&gt;</span>
+    * If the context is already associated with a {@link HttpServletRequest}
+    * then this call will detach the context from the underlying Http Session,
+    * and mark the context for destruction when the request is destroyed.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * @param session the {@link HttpSession} in which to store the bean
+    *           instances
+    * @return true if the context was destroyed immediately
+    */
+   public boolean destroy(HttpSession session);
+
+}
+</pre></div>
+
+
+<h1 id="map-bound-contexts">Map-bound contexts</h1>
+<p>We may also wish to add map-bound contexts, in which the contexts are backed by a map. Note that the example javadoc above needs expanding if we do.</p>
+<p>Add these dependent scoped beans:</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * Allows a thread-based context to be bound to some external instance storage
+ * (such as an HttpSession).
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * A context may be <span class="nt">&lt;em&gt;</span>detachable<span class="nt">&lt;/em&gt;</span> in which case a call to
+ * {@link ManagedContext#invalidate()} will detach the context from it&#39;s
+ * associated storage. A detached context is still usable (instances may be
+ * added or removed) however changes will not be written through to the
+ * underlying data store.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * Normally, a detachable context will have it&#39;s underlying bean store attached
+ * on a call to {@link ManagedContext#activate()} and detached on a call to
+ * {@link ManagedContext#deactivate()} however a subtype of {@link BoundContext}
+ * may change this behavior.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * If you call {@link #associate(Object)} you must ensure that you call
+ * {@link #dissociate(Object)} in all cases, otherwise you risk memory leaks.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * @param <span class="nt">&lt;S&gt;</span> the type of the external instance storage
+ * @see ManagedContext
+ */
+public interface BoundContext<span class="nt">&lt;S&gt;</span> extends Context
+{
+
+   /**
+    * Associate the context with the storage (for this thread). Once
+    * {@link #associate(Object)} has been called, further calls to
+    * {@link #associate(Object)} will be ignored, until the context has been
+    * subsequently {@link #dissociate(Object)} from the storage.
+    *
+    * @param storage the external storage
+    * @return true if the storage was attached, otherwise false
+    */
+   public boolean associate(S storage);
+
+   /**
+    * Dissociate the context from the storage (for this thread). The context
+    * will only dissociate from the same storage it associated with.
+    *
+    * @param storage the external storage
+    * @return true if the storage was dissociated
+    */
+   public boolean dissociate(S storage);
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A request context which can be bound to any Map. The context is automatically
+ * attached to the map on activation, and detached when {@link #invalidate()} is
+ * called.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * This context is not thread safe, and provides no thread safety for the
+ * underlying map. A thread-safe map can be used to back the context.
+ * <span class="nt">&lt;/p&gt;</span>
+ */
+public interface BoundRequestContext extends RequestContext, BoundContext<span class="nt">&lt;Map</span><span class="err">&lt;String,</span> <span class="err">Object</span><span class="nt">&gt;</span>&gt; {}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A session context which can be bound to any Map. The context is automatically
+ * attached to the map on activation, and detached when {@link #invalidate()} is
+ * called.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * This context is not thread safe, and provides no thread safety for the
+ * underlying map. A thread-safe map can be used to back the context.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ */
+public interface BoundSessionContext extends SessionContext, BoundContext<span class="nt">&lt;Map</span><span class="err">&lt;String,</span> <span class="err">Object</span><span class="nt">&gt;</span>&gt; {}
+</pre></div>
+
+
+<p>As always, conversations are harder to model. In this case, we need to provide both a map for the "session" (in which a conversation may stored long term) and a map for the current "request".</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A conversation is used to span multiple requests, however is shorter than a
+ * session. The {@link BoundConversationContext} uses one Map to represent a
+ * request, and a second to represent the session, which are encapsulated in a
+ * {@link BoundRequest}.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ */
+public interface BoundRequest {
+
+   /**
+    * Get the current request map.
+    *
+    * @return
+    */
+   public Map<span class="nt">&lt;String</span><span class="err">,</span> <span class="err">Object</span><span class="nt">&gt;</span> getRequestMap();
+
+   /**
+    * <span class="nt">&lt;p&gt;</span>
+    * Get the current session map.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * <span class="nt">&lt;p&gt;</span>
+    * A {@link BoundRequest} may be backed by a data store that only creates
+    * sessions on demand. It is recommended that if the session is not created
+    * on demand, or that the session has already been created (but is not
+    * required by this access) that the session is returned as it allows the
+    * conversation context to work more efficiently.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * @param create if true, then a session must be created
+    * @return the session map; null may be returned if create is false
+    */
+   public Map<span class="nt">&lt;String</span><span class="err">,</span> <span class="err">Object</span><span class="nt">&gt;</span> getSessionMap(boolean create);
+
+}
+</pre></div>
+
+
+<h3 id="context-conversation-management-of-weld-core-api">Context / Conversation Management of Weld-Core (API)</h3>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * The built in conversation context is associated with
+ * {@link ConversationScoped}. It can be activated, invalidated and deactivated.
+ * and provides various options for configuring conversation defaults.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * CDI comes with one implementation of the conversation context. The
+ * {@link HttpConversationContext}, in which conversations are bound to the
+ * {@link HttpSession}, can be injected:
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;pre&gt;</span>
+ * <span class="err">&amp;</span>#064Inject <span class="err">&amp;</span>#064Http ConversationContext conversationContext;
+ * <span class="nt">&lt;/pre&gt;</span>
+ *
+ * @see BoundConversationContext
+ * @see HttpConversationContext
+ * @see ConversationScoped
+ *
+ */
+public interface ConversationContext extends ManagedContext
+{
+
+   /**
+    * Cause any expired conversations to be ended, and therefore marked for
+    * destruction when deactivate is called.
+    *
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public void invalidate();
+
+   /**
+    * Activate the conversation context, using the id provided to attempt to
+    * restore a long-running conversation
+    *
+    * @param cid if the cid is null, a transient conversation will be created,
+    *           otherwise the conversation will be restored
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public void activate(String cid);
+
+   /**
+    * Activate the conversation context, starting a new transient conversation
+    *
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public void activate();
+
+   /**
+    * Set the name of the parameter used to propagate the conversation id
+    *
+    * @param cid the name of the conversation id parameter
+    */
+   public void setParameterName(String cid);
+
+   /**
+    * Get the name of the parameter used to propagate the conversation id
+    *
+    * @return the name of the conversation id parameter
+    */
+   public String getParameterName();
+
+   /**
+    * Set the concurrent access timeout
+    *
+    * @param timeout the timeout (in ms) for the concurrent access lock
+    */
+   public void setConcurrentAccessTimeout(long timeout);
+
+   /**
+    * Get the current concurrent access timeout
+    *
+    * @return the timeout (in ms) for the concurrent access lock
+    */
+   public long getConcurrentAccessTimeout();
+
+   /**
+    * Set the default inactivity timeout. This may be overridden on a per
+    * conversation basis using {@link Conversation#setTimeout(long)}
+    *
+    * @param timeout the default inactivity timeout (in ms)
+    */
+   public void setDefaultTimeout(long timeout);
+
+   /**
+    * Get the default inactivity timeout. This may have been overridden on a per
+    * conversation basis.
+    *
+    * @return the default inactivity timeout (in ms)
+    */
+   public long getDefaultTimeout();
+
+   /**
+    * Get conversations currently known to the context. This will include any
+    * non transient conversations, as well as any conversations which were
+    * previously long running and have been made transient during this request.
+    *
+    * @return a collection containing the conversations
+    *
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public Collection<span class="nt">&lt;ManagedConversation&gt;</span> getConversations();
+
+   /**
+    * Get the conversation with the given id.
+    *
+    * @param id the id of the conversation to get
+    * @return the conversation, or null if no conversation is known
+    *
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public ManagedConversation getConversation(String id);
+
+   /**
+    * Generate a new, unique, conversation id
+    *
+    * @return a new, unique conversation id
+    *
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public String generateConversationId();
+
+   /**
+    * Get a handle the current conversation (transient or otherwise).
+    *
+    * @return the current conversation
+    * @throws IllegalStateException if the context is unable to access the
+    *            underlying data store
+    */
+   public ManagedConversation getCurrentConversation();
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>package org.jboss.weld.context;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Conversation;
+
+/**
+ * <span class="nt">&lt;p&gt;</span>
+ * Provides management operations for conversations, including locking, and
+ * expiration management.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * @see ConversationContext
+ *
+ */
+public interface ManagedConversation extends Conversation {
+
+   /**
+    * Attempts to unlock the conversation
+    *
+    * @throws ContextNotActiveException if the conversation context is not
+    *            active
+    * @return true if the unlock was successful, false otherwise
+    */
+   public boolean unlock();
+
+   /**
+    * Attempts to lock the conversation for exclusive usage
+    *
+    * @param timeout The time in milliseconds to wait on the lock
+    * @return True if lock was successful, false otherwise
+    * @throws InterruptedException if the lock operation was unsuccessful * @throws
+    * @throws ContextNotActiveException if the conversation context is not
+    *            active
+    */
+   public boolean lock(long timeout);
+
+   /**
+    * Gets the last time the conversation was used (for data access)
+    *
+    * @return time (in ms) since the conversation was last used
+    * @throws ContextNotActiveException if the conversation context is not
+    *            active
+    */
+   public long getLastUsed();
+
+   /**
+    * Touches the managed conversation, updating the &quot;last used&quot; timestamp
+    *
+    * @throws ContextNotActiveException if the conversation context is not
+    *            active
+    */
+   public void touch();
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * <span class="nt">&lt;p&gt;</span>
+ * A conversation context which can be bound to a pair of Maps encapsulated by
+ * {@link BoundRequest}. The context is automatically attached to the bound
+ * request on activation, and detached when {@link #invalidate()} is called.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * The {@link BoundConversationContext} is detachable, and transient
+ * conversations are only attached at the end of a request.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ * <span class="nt">&lt;p&gt;</span>
+ * This context is not thread safe, and provides no thread safety for the
+ * underlying map. A thread-safe map can be used to back the context - in this
+ * case the map can be used as an underlying store in multiple threads safely.
+ * <span class="nt">&lt;/p&gt;</span>
+ *
+ */
+public interface BoundConversationContext extends ConversationContext, BoundContext<span class="nt">&lt;BoundRequest&gt;</span>
+{
+
+   /**
+    * Destroy all conversations in the session.
+    *
+    * @param session the session for which to destroy all conversations
+    * @return
+    */
+   public boolean destroy(Map<span class="nt">&lt;String</span><span class="err">,</span> <span class="err">Object</span><span class="nt">&gt;</span> session);
+
+}
+</pre></div>
+
+
+<p>b</p>
+<div class="codehilite"><pre>/**
+ * An Http Session backed conversation context. A transient conversation will be
+ * detached from the underlying session. If the conversation is promoted to long
+ * running, context will be attached to the underlying Http Session at the end
+ * of the request.
+ *
+ */
+public interface HttpConversationContext extends BoundContext<span class="nt">&lt;HttpServletRequest&gt;</span>, ConversationContext
+{
+
+   /**
+    * <span class="nt">&lt;p&gt;</span>
+    * If the context is not currently associated with a
+    * {@link HttpServletRequest}, then the context will be associated with the
+    * specified {@link HttpSession} (for this thread), activated, destroyed, and
+    * then deactivated. Any conversations associated with the context will also
+    * be destroyed.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * <span class="nt">&lt;p&gt;</span>
+    * If the context is already associated with a {@link HttpServletRequest}
+    * then this call will detach the context from the underlying Http Session,
+    * and mark the context for destruction when the request is destroyed.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * <span class="nt">&lt;p&gt;</span>
+    * This will cause any transient conversations, and any long running
+    * conversations associated with the session, to be destroyed.
+    * <span class="nt">&lt;/p&gt;</span>
+    *
+    * @param session the {@link HttpSession} in which to store the bean
+    *           instances
+    * @return true if the context was destroyed immediately
+    */
+   public boolean destroy(HttpSession session);
+
+}
+</pre></div>
+
+    </div>
+</div>
+<div id="copyright" class="container_16">
+    <p>Copyright &#169; 20011-2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</body>
+</html>

Added: websites/staging/deltaspike/trunk/content/deltaspike/community.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/community.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/community.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,213 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+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.
+-->
+<html>
+<head>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
+    <title>Apache DeltaSpike - Welcome to DeltaSpike</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. -->
+</head>
+<body>
+<div id="page" class="container_16">
+        <div id="header" class="grid_8 alpha">
+            <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
+            <span id="projectname">Apache DeltaSpike</span>
+        </div>
+
+        <div id="nav" class="grid_8 omega">
+            <ul>
+                <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
+                <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
+                <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
+                <li><a href="http://people.apache.org" title="The People">People</a></li>
+                <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
+                <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
+            </ul>
+        </div>
+        <hr/>
+        <div class="grid_8">
+            <p id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/deltaspike/">Deltaspike</a></p>
+        </div>
+
+        <div id="dsearch" class="grid_8">
+            <form name="search" id="search" action="http://www.google.com/search" method="get">
+                <input value="incubator.apache.org/deltaspike/" name="sitesearch" type="hidden"/>
+                <input type="text" name="q" id="query">
+                <input type="submit" id="submit" value="Search">
+            </form>
+        </div>
+        <hr/>
+
+    <div id="content-wrapper" class="container_16">
+        <h1>Welcome to DeltaSpike</h1>
+        <p>DeltaSpike will consist of a number of portable CDI extensions that provide useful features for Java application developers. The goal of DeltaSpike is to create a de-facto standard of CDI-Extensions that is developed and maintained by the community. We are an open minded community and you are very welcome to join the effort!</p>
+<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 [Documentation|DeltaSpike:Temporary Documentation] and [subscribe|mailto:deltaspike-users-subscribe@incubator.apache.org] our [mailing list for users|mailto:deltaspike-users@incubator.apache.org]. If you have troubles to find the information you are looking for, you can also ask in our [IRC-Channel|http://people.apache.org/~gpetracek/deltaspike/freenode.html].</p>
+<p>Furthermore, you can check our [mail-archive|http://mail-archives.apache.org/mod_mbox/incubator-deltaspike-users/] (mirrors are available at: [MarkMail|http://markmail.org/search/?q=list%3Aorg.apache.incubator.deltaspike-users+order%3Adate-backward]).</p>
+<p>Before you file a ticket in our [Jira|https://issues.apache.org/jira/browse/DELTASPIKE], please ask on the mailing list if it's a known issue in case of a bug or if there is an ongoing discussion in case of a feature.</p>
+<p>You are very welcome to follow our [twitter account|http://twitter.com/#!/DeltaSpikeTeam] and spread the word of DeltaSpike with Tweets, Blog-Entries,...</p>
+<h1 id="contributors">Contributors</h1>
+<p>Before you get a committer you have to contribute to our effort. E.g. you can help users, participate in discussions on the dev list, submit patches,... . Therefore, it's essential to file a/n (I)CLA (http://www.apache.org/licenses/icla.txt btw. http://www.apache.org/licenses/cla-corporate.txt) and send it to secretary at apache dot org (or fax it) as early as possible.</p>
+<p>If you would like to submit a patch through Jira, you can have a look at the [suggested approach|https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows]</p>
+<h1 id="committers">Committers</h1>
+<p>Before you read this section, please ensure that you have read the contributor section. All of you are welcome to join our development effort. [Subscribe|mailto:deltaspike-dev-subscribe@incubator.apache.org] our [mailing list for developers|mailto:deltaspike-dev@incubator.apache.org] and start contributing and help users.</p>
+<p>Optionally [subscribe|mailto:deltaspike-commits-subscribe@incubator.apache.org] our [mailing list for commits|mailto:deltaspike-commits@incubator.apache.org].</p>
+<p>Furthermore, you can check our [mail-archive|http://mail-archives.apache.org/mod_mbox/incubator-deltaspike-dev/] (mirrors are available at [MarkMail|http://markmail.org/search/?q=list%3Aorg.apache.incubator.deltaspike-dev+order%3Adate-backward] and [Nabble|http://apache-deltaspike-incubator-discussions.2316169.n4.nabble.com/]).</p>
+<p>Further details are available at http://www.apache.org/dev/.</p>
+<h2 id="vcs-repository">VCS / Repository</h2>
+<p>We are using GIT and there is a <em>read-only</em> [GitHub mirror|https://github.com/apache/incubator-deltaspike]. Furthermore, we follow an unified [GIT workflow|https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows] to keep the commit history straight and therefore simple and clean.
+General details about GIT at Apache are available [here|http://wiki.apache.org/couchdb/Git_At_Apache_Guide] and at http://git-wip-us.apache.org.</p>
+<p>Our GIT repository is at https://git-wip-us.apache.org/repos/asf/incubator-deltaspike.git (see also https://git-wip-us.apache.org/repos/asf)</p>
+<div class="codehilite"><pre><span class="sr">//i</span><span class="n">nitial</span> <span class="s">&#39;checkout&#39;</span><span class="p">:</span>
+<span class="n">git</span> <span class="n">clone</span> <span class="n">https:</span><span class="sr">//gi</span><span class="n">t</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">-</span><span class="n">deltaspike</span><span class="o">.</span><span class="n">git</span>
+
+<span class="sr">//</span><span class="n">update</span> <span class="n">of</span> <span class="n">an</span> <span class="n">existing</span> <span class="n">clone</span> <span class="n">which</span> <span class="n">might</span> <span class="n">contain</span> <span class="n">changes</span>
+<span class="n">git</span> <span class="n">pull</span> <span class="o">--</span><span class="n">rebase</span>
+</pre></div>
+
+
+<h2 id="invitation-to-become-a-project-committer">Invitation to become a project Committer</h2>
+<p>As soon as the PPMC is confident that you are a great addition to the team, one of the PPMC members starts an internal vote.</p>
+<h1 id="ppmc">(P)PMC</h1>
+<h2 id="votes">Votes</h2>
+<p>To: private list
+CC: private incubator list</p>
+<div class="codehilite"><pre><span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="o">...</span> <span class="n">becoming</span> <span class="n">a</span> <span class="n">committer</span>
+
+<span class="n">Hi</span><span class="p">,</span>
+
+<span class="n">over</span> <span class="n">the</span> <span class="n">past</span> <span class="n">weeks</span><span class="p">,</span> <span class="o">...</span> <span class="p">[</span><span class="n">reason</span> <span class="k">for</span> <span class="n">the</span> <span class="n">suggestion</span><span class="p">]</span>
+
+<span class="n">Therefore</span> <span class="n">I</span><span class="s">&#39;d like to vote ... in as a committer!</span>
+
+<span class="s">The options for the vote are:</span>
+<span class="s">[+1] get him on board</span>
+<span class="s">[+0] don&#39;</span><span class="n">t</span> <span class="n">care</span>
+<span class="p">[</span><span class="o">-</span><span class="mi">1</span><span class="p">]</span> <span class="n">nope</span><span class="p">,</span> <span class="n">because</span><span class="o">...</span> <span class="p">(</span><span class="n">fill</span> <span class="n">in</span><span class="p">)</span>
+
+<span class="n">The</span> <span class="n">vote</span> <span class="n">is</span> <span class="nb">open</span> <span class="k">for</span> <span class="mi">72</span><span class="n">h</span><span class="o">.</span>
+
+<span class="n">Regards</span><span class="p">,</span>
+<span class="o">...</span>
+</pre></div>
+
+
+<p>After 72 hours
+To: private list</p>
+<div class="codehilite"><pre><span class="n">Result</span> <span class="p">(</span><span class="n">was:</span> <span class="n">Re:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="o">...</span> <span class="n">becoming</span> <span class="n">a</span> <span class="n">committer</span><span class="p">)</span>
+
+<span class="n">thank</span> <span class="n">you</span> <span class="k">for</span> <span class="n">voting</span><span class="o">!</span>
+
+<span class="n">the</span> <span class="n">vote</span> <span class="n">passed</span> <span class="n">with</span> <span class="n">the</span> <span class="n">following</span> <span class="n">result:</span>
+
+<span class="o">+</span><span class="mi">1</span><span class="p">:</span>
+<span class="o">...</span>
+
+<span class="o">+</span><span class="mi">0</span><span class="p">:</span>
+<span class="o">...</span>
+
+<span class="o">-</span><span class="mi">1</span><span class="p">:</span>
+<span class="o">...</span>
+
+<span class="n">Regards</span><span class="p">,</span>
+<span class="o">...</span>
+</pre></div>
+
+
+<p>In case of a PPMC vote it's required that a IPMC member sends a lazy consensus vote to the private incubator list. That isn't required for top-level projects.</p>
+<p>To: private incubator list</p>
+<div class="codehilite"><pre><span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Invite</span> <span class="o">...</span> <span class="n">to</span> <span class="n">become</span> <span class="n">a</span> <span class="n">DeltaSpike</span> <span class="n">Committer</span>
+
+<span class="n">The</span> <span class="n">DeltaSpike</span> <span class="n">PPMC</span> <span class="n">has</span> <span class="n">completed</span> <span class="n">a</span> <span class="n">vote</span> <span class="n">to</span> <span class="n">invite</span> <span class="o">...</span> <span class="n">to</span>
+<span class="n">become</span> <span class="n">a</span> <span class="n">project</span> <span class="n">committer</span><span class="o">.</span>
+
+<span class="n">The</span> <span class="n">vote</span> <span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="n">passed</span> <span class="n">with</span> <span class="n">the</span> <span class="n">following</span> <span class="o">+</span><span class="mi">1</span> <span class="n">votes</span>  <span class="n">from</span> <span class="n">IPMC</span> <span class="n">members:</span>
+<span class="o">...</span>
+<span class="ow">and</span> <span class="o">...</span> <span class="o">+</span><span class="mi">0</span> <span class="ow">and</span> <span class="o">...</span> <span class="o">-</span><span class="mi">1</span> <span class="n">votes</span><span class="o">.</span> <span class="n">So</span> <span class="n">this</span> <span class="n">is</span> <span class="n">a</span> <span class="mi">72</span> <span class="n">hour</span> <span class="n">lazy</span> <span class="n">consensus</span> <span class="n">vote</span><span class="o">.</span>
+
+<span class="n">Thanks</span> <span class="o">&amp;</span> <span class="n">regards</span><span class="p">,</span>
+<span class="o">...</span>
+
+<span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">...</span>
+</pre></div>
+
+
+<p>It isn't required to do so, but usually the person who started also sends the invitation.</p>
+<p>CC: the private list</p>
+<div class="codehilite"><pre><span class="p">[</span><span class="n">INVITATION</span><span class="p">]</span> <span class="n">to</span> <span class="n">become</span> <span class="n">an</span> <span class="n">Apache</span> <span class="n">DeltaSpike</span> <span class="n">committer</span>
+
+<span class="n">Dear</span> <span class="o">...</span><span class="p">,</span>
+
+<span class="n">On</span> <span class="n">behalf</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">DeltaSpike</span> <span class="n">PPMC</span><span class="p">,</span> <span class="n">I</span> <span class="n">would</span> <span class="n">like</span> <span class="n">to</span> <span class="n">extend</span> <span class="n">an</span>
+<span class="n">invitation</span> <span class="n">to</span> <span class="n">become</span> <span class="n">a</span> <span class="n">DeltaSpike</span> <span class="n">Committer</span><span class="o">.</span> <span class="n">If</span> <span class="n">you</span> <span class="n">might</span> <span class="n">be</span> <span class="n">interested</span><span class="p">,</span>
+<span class="n">please</span> <span class="n">be</span> <span class="n">sure</span> <span class="n">to</span> <span class="n">review</span> <span class="n">the</span> <span class="n">How</span> <span class="n">the</span> <span class="n">ASF</span> <span class="n">Works</span> <span class="n">pages</span><span class="o">.</span>
+
+<span class="o">*</span> <span class="n">http:</span><span class="sr">//</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/foundation/</span><span class="n">how</span><span class="o">-</span><span class="n">it</span><span class="o">-</span><span class="n">works</span><span class="o">.</span><span class="n">html</span>
+<span class="o">*</span> <span class="n">http:</span><span class="sr">//i</span><span class="n">ncubator</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/guides/commi</span><span class="n">tter</span><span class="o">.</span><span class="n">html</span>
+
+<span class="n">If</span> <span class="n">you</span> <span class="n">decide</span> <span class="n">to</span> <span class="nb">accept</span> <span class="n">the</span> <span class="n">invitation</span><span class="p">,</span> <span class="n">the</span> <span class="n">first</span> <span class="n">step</span> <span class="n">would</span> <span class="n">be</span> <span class="n">to</span>
+<span class="n">file</span> <span class="n">an</span> <span class="n">Individual</span> <span class="n">Contributor</span> <span class="n">License</span> <span class="n">Agreement</span> <span class="p">(</span><span class="k">if</span> <span class="n">you</span> <span class="n">haven</span><span class="s">&#39;t done</span>
+<span class="s">so already). If you have an intellectual property agreement with your</span>
+<span class="s">employer, they may also need to file a corporate agreement</span>
+
+<span class="s">* http://apache.org/licenses/cla-corporate.txt</span>
+
+<span class="s">The next step would be to send your first three choices for an</span>
+<span class="s">Apache account name (special characters aren&#39;</span><span class="n">t</span> <span class="n">supported</span><span class="p">)</span><span class="o">.</span>
+<span class="n">Once</span> <span class="n">the</span> <span class="n">account</span> <span class="n">is</span> <span class="n">setup</span><span class="p">,</span> <span class="n">you</span> <span class="n">will</span> <span class="n">be</span> <span class="n">able</span> <span class="n">to</span>
+<span class="n">commit</span> <span class="n">to</span> <span class="n">the</span> <span class="n">DeltaSpike</span> <span class="n">repository</span><span class="o">.</span>
+
+<span class="n">We</span> <span class="k">do</span> <span class="n">hope</span> <span class="n">that</span> <span class="n">you</span> <span class="n">will</span> <span class="n">be</span> <span class="n">able</span> <span class="n">to</span> <span class="nb">join</span> <span class="n">us</span><span class="o">.</span> <span class="n">And</span><span class="p">,</span> <span class="n">we</span> <span class="k">do</span> <span class="n">thank</span> <span class="n">you</span> <span class="k">for</span>
+<span class="n">your</span> <span class="n">sustained</span> <span class="n">efforts</span> <span class="n">in</span> <span class="n">helping</span> <span class="n">us</span> <span class="n">build</span> <span class="ow">not</span> <span class="n">only</span> <span class="n">great</span> <span class="n">software</span><span class="p">,</span>
+<span class="n">but</span> <span class="n">a</span> <span class="n">great</span> <span class="n">community</span><span class="o">.</span>
+
+<span class="n">Regards</span><span class="p">,</span>
+<span class="o">...</span>
+</pre></div>
+
+
+<p>Send an [account request|http://id.apache.org/acreq] and announce the new community member if s/he accepted.</p>
+<div class="codehilite"><pre><span class="p">[</span><span class="n">COMMUNITY</span><span class="p">]</span> <span class="n">DeltaSpike</span> <span class="o">+=</span> <span class="o">...</span>
+
+<span class="n">The</span> <span class="n">DeltaSpike</span> <span class="n">PPMC</span> <span class="n">is</span> <span class="n">proud</span> <span class="n">to</span> <span class="n">announce</span> <span class="n">a</span> <span class="k">new</span> <span class="n">addition</span> <span class="n">to</span> <span class="k">our</span> <span class="n">community</span><span class="o">.</span>
+
+<span class="n">Please</span> <span class="n">welcome</span> <span class="o">...</span> <span class="n">as</span> <span class="n">the</span> <span class="n">newest</span> <span class="n">DeltaSpike</span> <span class="n">committer</span><span class="o">!</span>
+
+<span class="nv">@</span><span class="err">...</span><span class="nv">:</span> <span class="n">Please</span> <span class="n">ensure</span> <span class="n">you</span> <span class="n">understand</span> <span class="k">our</span> <span class="n">workflow</span> <span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="ow">and</span> <span class="n">add</span> <span class="n">yourself</span> <span class="n">to</span> <span class="n">the</span> <span class="n">Parent</span><span class="o">-</span><span class="n">POM</span> <span class="p">[</span><span class="mi">2</span><span class="p">]</span><span class="o">.</span>
+
+<span class="n">Welcome</span> <span class="o">&amp;</span> <span class="n">regards</span><span class="p">,</span>
+<span class="n">Gerhard</span>
+
+<span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="n">https:</span><span class="sr">//c</span><span class="n">wiki</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/confluence/</span><span class="n">display</span><span class="sr">/DeltaSpike/</span><span class="n">Suggested</span><span class="o">+</span><span class="n">Git</span><span class="o">+</span><span class="n">Workflows</span>
+<span class="p">[</span><span class="mi">2</span><span class="p">]</span> <span class="n">http:</span><span class="sr">//s</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">deltaspike_parent</span><span class="o">-</span><span class="n">pom</span>
+</pre></div>
+
+    </div>
+</div>
+<div id="copyright" class="container_16">
+    <p>Copyright &#169; 20011-2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</body>
+</html>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/examples.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/examples.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/examples.html Tue Jul  3 16:09:36 2012
@@ -22,7 +22,7 @@ under the License.
     <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
     <link rel="stylesheet" type="text/css" media="screen" href="resources/site.css"/>
-    <title>Apache DeltaSpike - </title>
+    <title>Apache DeltaSpike - Examples</title>
 
     
 
@@ -31,12 +31,12 @@ under the License.
 </head>
 <body>
 <div id="page" class="container_16">
-        <div id="header" class="grid_7 alpha">
+        <div id="header" class="grid_8 alpha">
             <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
             <span id="projectname">Apache DeltaSpike</span>
         </div>
 
-        <div id="nav" class="grid_9 omega">
+        <div id="nav" class="grid_8 omega">
             <ul>
                 <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
                 <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
@@ -61,9 +61,8 @@ under the License.
         <hr/>
 
     <div id="content-wrapper" class="container_16">
-        <h1></h1>
-        <h1 id="examples">Examples</h1>
-<h2 id="1">#1</h2>
+        <h1>Examples</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>