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 [3/3] - in /websites/staging/deltaspike/trunk/content: ./ deltaspike/ deltaspike/resources/

Modified: websites/staging/deltaspike/trunk/content/deltaspike/exceptions.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/exceptions.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/exceptions.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 - Exception Handling</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="exception-handling">Exception Handling</h1>
-<p>Exception handling in DeltaSpike is based around the CDI eventing model. While
+        <h1>Exception Handling</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/deltaspike/features.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/features.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/features.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 - Feature Overview</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="feature-overview">Feature Overview</h1>
-<h2 id="projectstage">ProjectStage</h2>
+        <h1>Feature Overview</h1>
+        <h2 id="projectstage">ProjectStage</h2>
 <p>Project stages allow to use implementations depending on the current environment. E.g. you can implement a bean which creates sample-data for system tests which gets activated only in case of project-stage {{SystemTest}}.</p>
 <ul>
 <li>Besides custom project-stages* it's possible to use the following pre-defined project-stages:</li>

Added: websites/staging/deltaspike/trunk/content/deltaspike/getting-involved.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/getting-involved.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/getting-involved.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,132 @@
+<!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 - Getting Involved</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>Getting Involved</h1>
+        <p>Everybody is welcome to get involved with our community. You can find general information at http://apache.org/foundation/getinvolved.html and http://apache.org/foundation/how-it-works.html.
+This page provides some details about the different levels of getting involved.</p>
+<h1 id="mailing-lists">Mailing lists</h1>
+<p>We are an open community. Discussions take place in the open. Just subscribe our mailing list/s to ask/answer questions or start/join discussions.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th>List Name</th>
+<th></th>
+<th>Address</th>
+<th></th>
+<th>Subscribe</th>
+<th></th>
+<th>Unsubscribe</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Deltaspike Developer List</td>
+<td>deltaspike-dev@incubator.apache.org</td>
+<td>[Subscribe</td>
+<td>mailto:deltaspike-dev-subscribe@incubator.apache.org]</td>
+<td>[Unsubscribe</td>
+<td>mailto:deltaspike-dev-unsubscribe@incubator.apache.org]</td>
+<td>[Archive</td>
+<td>http://mail-archives.apache.org/mod_mbox/incubator-deltaspike-dev/]</td>
+</tr>
+<tr>
+<td>Deltaspike Commits List</td>
+<td>deltaspike-users@incubator.apache.org</td>
+<td>[Subscribe</td>
+<td>mailto:deltaspike-commits-subscribe@incubator.apache.org]</td>
+<td>[Unsubscribe</td>
+<td>mailto:deltaspike-commits-unsubscribe@incubator.apache.org]</td>
+<td>[Archive</td>
+<td>http://mail-archives.apache.org/mod_mbox/incubator-deltaspike-commits]</td>
+</tr>
+</tbody>
+</table>
+<p>You can also use online forum to follow mailing lists.</p>
+<ul>
+<li><a href="http://apache-deltaspike-incubator-discussions.2316169.n4.nabble.com/">Nabble - User/Developer/Commiter</a></li>
+</ul>
+<h1 id="jira">JIRA</h1>
+<p>Any kind of issue has to be filed in our [issue-tracker|https://issues.apache.org/jira/browse/DELTASPIKE]. If you have any question, you can ask us (e.g. via the mailing list for users).</p>
+<h1 id="spread-the-word">Spread the word</h1>
+<p>You are very welcome e.g. to write blog entries, tweet about the project or just follow our twitter account (DeltaSpikeTeam), ...</p>
+<h1 id="irc">IRC</h1>
+<p>Our IRC room is irc://irc.freenode.net/deltaspike</p>
+<div class="codehilite"><pre><span class="sr">//</span><span class="n">with</span> <span class="n">the</span> <span class="n">irssi</span> <span class="n">commandline</span> <span class="n">client:</span>
+<span class="nv">$</span> <span class="nv">irssi</span>
+
+<span class="o">&gt;</span> <span class="o">/</span><span class="nb">connect</span> <span class="n">irc</span><span class="o">.</span><span class="n">freenode</span><span class="o">.</span><span class="n">net</span>
+<span class="o">&gt;</span> <span class="o">/</span><span class="nb">join</span> <span class="c1">#deltaspike</span>
+</pre></div>
+
+
+<h1 id="join-our-development-effort">Join our development effort</h1>
+<p>One of the first steps is to submit your (I)CLA (http://www.apache.org/licenses/icla.txt btw. http://www.apache.org/licenses/cla-corporate.txt) to secretary at apache dot org. Further details are available at http://www.apache.org/dev/.</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/getting-started.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/getting-started.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/getting-started.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 - DeltaSpike Module Overview</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="deltaspike-module-overview">DeltaSpike Module Overview</h1>
-<p>DeltaSpike consists of the following modules:</p>
+        <h1>DeltaSpike Module Overview</h1>
+        <p>DeltaSpike consists of the following modules:</p>
 <p>Required modules:</p>
 <ul>
 <li>Core</li>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/index.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/index.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/index.html Tue Jul  3 16:09:36 2012
@@ -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>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/integration-tests.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/integration-tests.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/integration-tests.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 - Integration Tests</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>
-        <h2 id="integration-tests">Integration Tests</h2>
-<p>With the unpack Maven-Plugin all Arquillian-Tests get copied to the integration-test module. Together with the special integration-tests they get executed via a remote container. Currently we have configurations for the following containers.</p>
+        <h1>Integration Tests</h1>
+        <p>With the unpack Maven-Plugin all Arquillian-Tests get copied to the integration-test module. Together with the special integration-tests they get executed via a remote container. Currently we have configurations for the following containers.</p>
 <h3 id="tomee">TomEE</h3>
 <div class="codehilite"><pre><span class="n">Executing</span> <span class="n">the</span> <span class="n">Arquillian</span> <span class="n">tests</span> <span class="n">with</span> <span class="n">Apache</span> <span class="n">TomEE</span>
 <span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Ptomee</span><span class="o">-</span><span class="n">build</span><span class="o">-</span><span class="n">managed</span>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/irc.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/irc.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/irc.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 - IRC</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="irc">IRC</h1>
-<p>You can join us on irc.freenode.net, channel #deltaspike</p>
+        <h1>IRC</h1>
+        <p>You can join us on irc.freenode.net, channel #deltaspike</p>
 
     </div>
 </div>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/jpa.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/jpa.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/jpa.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 - JPA Module</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="jpa-module">JPA Module</h1>
-<h2 id="transactional">@Transactional</h2>
+        <h1>JPA Module</h1>
+        <h2 id="transactional">@Transactional</h2>
 <p>This annotation is an alternative to transactional EJBs which allows to execute a method within a transaction.
 Before it's possible to start using the annotation, it's required to implement a CDI producer for an {{EntityManager}} and it's needed to inject the {{EntityManager}} in the bean which uses {{@Transactional}}. As shown later on it's also possible to use multiple qualifiers for using different {{EntityManager}}s.</p>
 <p>The following example shows a simple producer for an {{EntityManager}} and the corresponding dispose-method.

Added: websites/staging/deltaspike/trunk/content/deltaspike/migration-guide.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/migration-guide.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/migration-guide.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,99 @@
+<!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 - Migrate from MyFaces CODI-Core 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>Migrate from MyFaces CODI-Core to 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>
+<p>Only the config key changed [TODO]</p>
+<h3 id="deactivatable-and-classdeactivator">Deactivatable and ClassDeactivator</h3>
+<p>The concept hasn't changed.</p>
+<h3 id="codiconfig">CodiConfig</h3>
+<p>The concept hasn't changed.</p>
+<h3 id="annotation-literals">Annotation literals</h3>
+<p>The concept hasn't changed. We just added further implementations.</p>
+<h3 id="beanmanagerprovider">BeanManagerProvider</h3>
+<p>The concept hasn't changed. We just splitted the functionality. The util methods are available in BeanProvider and their name and signature have been unified.</p>
+<h2 id="extended-concepts">Extended concepts</h2>
+<p>Here you can see features which were added and the concept itself changed a bit or got merged with concepts from Seam3</p>
+<h3 id="configuredvalueresolver">ConfiguredValueResolver</h3>
+<p>Here we added more flexibility (esp. re-ordering the default lookup mechanisms). See {{ConfigResolver}}, {{ConfigSourceProvider}} and {{ConfigSource}}.</p>
+<h3 id="projectstageactivated-and-expressionactivated">ProjectStageActivated and ExpressionActivated</h3>
+<p>We merged them with a feature of Seam3 and now it's called {{@Exclude}}. That means the basic functionality is still in place (nothing was removed), but the logic is now inverse.</p>
+<h3 id="defaultannotation">DefaultAnnotation</h3>
+<p>(In progress) We merge it with a similar helper of Seam-Solder to provide custom values for annotation attributes.</p>
+<h2 id="postponed-concepts">Postponed concepts</h2>
+<p>We couldn't agree on these features. If you find them useful, please contact the mailing-list. If we see that users need it for reasons we might haven't seen so far, we will discuss it again.</p>
+<h3 id="beannames">BeanNames</h3>
+<h2 id="dropped-concepts">Dropped concepts</h2>
+<h3 id="java-15-support">Java 1.5 Support</h3>
+<h1 id="migrate-from-seam-solder-to-deltaspike">Migrate from Seam-Solder to DeltaSpike</h1>
+<p>[TODO]</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/news.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/news.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/news.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,143 @@
+<!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 - Apache DeltaSpike News</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>Apache DeltaSpike News</h1>
+        <h2 id="1st-release-01-incubating-10022012">1st Release (0.1 incubating) (10.02.2012)</h2>
+<p>The Apache DeltaSpike team is pleased to [announce|http://s.apache.org/cTt] the first release (v0.1-incubating).</p>
+<p>The first release contains about 5 000 lines of code (including tests and 10 000 including comments).
+The [release notes|http://s.apache.org/DeltaSpike_01incubating] contains 42 JIRA tickets.</p>
+<h2 id="execution-of-integration-tests-with-remote-servers-01022012">Execution of integration tests with remote servers (01.02.2012)</h2>
+<p>[C4J|http://www.c4j.be/] helps us with nightly builds which deploy our integration tests to remote-servers (AS7 and GF3).</p>
+<h2 id="new-committer-29012012">New Committer (29.01.2012)</h2>
+<p>Lukasz Lenart joined our development community.</p>
+<h2 id="new-committer-28012012">New Committer (28.01.2012)</h2>
+<p>Christian Kaltepoth joined our development community.</p>
+<h2 id="new-committer-27012012">New Committer (27.01.2012)</h2>
+<p>Rudy De Busscher joined our development community.</p>
+<h2 id="nabble-mirror-21012012">Nabble Mirror (21.01.2012)</h2>
+<p>Dan Allen created a [Nabble mirror|http://s.apache.org/deltaspike-dev_nabble] for the dev-list (based on http://incubator.apache.org/mail/deltaspike-dev/)</p>
+<h2 id="new-committers-13012012">New Committers (13.01.2012)</h2>
+<p>Dan Allen and Lincoln Baxter III are our first committers after the initial committers.</p>
+<h2 id="github-mirror-12012012">GitHub Mirror (12.01.2012)</h2>
+<p>The infra team created our mirror (https://github.com/apache/incubator-deltaspike)</p>
+<h2 id="creation-of-the-status-page-30122011">Creation of the Status Page (30.12.2011)</h2>
+<p>We created an initial version of our status page (http://incubator.apache.org/guides/website.html)</p>
+<h2 id="nightly-builds-29122011">Nightly builds (29.12.2011)</h2>
+<p>The infra team added the GIT plugin to Jenkins and we created build jobs for nightly builds which get deployed to https://repository.apache.org/content/groups/snapshots/org/apache/deltaspike/</p>
+<h2 id="sonar-build-29122011">Sonar build (29.12.2011)</h2>
+<p>Gavin McDonald did the Sonar setup (https://analysis.apache.org/dashboard/index/org.apache.deltaspike:deltaspike-project)</p>
+<h2 id="first-commit-22122011">First Commit (22.12.2011)</h2>
+<p>The infra team created our GIT repository and we made the first commit.</p>
+<h2 id="first-jira-ticket-13122011">First JIRA ticket (13.12.2011)</h2>
+<p>We created our JIRA project and filed the first ticket.</p>
+<h2 id="first-report-122011-12122011">First report 12.2011 (12.12.2011)</h2>
+<p>We submitted the first report to http://wiki.apache.org/incubator/December2011</p>
+<h2 id="twitter-account">Twitter Account</h2>
+<p>We created our Twitter account @DeltaSpikeTeam</p>
+<h2 id="mailing-lists-8122011">Mailing-lists (8.12.2011)</h2>
+<p>Matt Benson created our [mailing-lists|https://s.apache.org/Kpg].</p>
+<h2 id="vote-closed-7122011">Vote closed (7.12.2011)</h2>
+<p>The vote to join the incubator was closed. There were 8 binding +1 votes, 3 non-binding +1 votes and no -1 votes. In parallel several other folks showed up and told us that they are interested to join the effort.</p>
+<p>We start with the following initial committers (and therefore PPMC members):
+Andy Gibson
+ * Antoine Sabot-Durand
+ * Arne Limburg
+ * Brian Leathem
+ * Cody Lerum
+ * David Blevins
+ * George Gastaldi
+ * Gerhard Petracek
+ * Jakob Korherr
+ * Jason Porter
+ * John Ament
+ * Jozef Hartinger
+ * Ken Finnigan
+ * Marius Bogoevici
+ * Mark Struberg
+ * Matthias Wessendorf
+ * Pete Muir
+ * Pete Royle
+ * Rick Hightower
+ * Shane Bryzak
+ * Stuart Douglas</p>
+<p>Our mentors are:</p>
+<ul>
+<li>David Blevins</li>
+<li>Gerhard Petracek</li>
+<li>Jim Jagielski</li>
+<li>Mark Struberg</li>
+<li>Matt Benson</li>
+<li>Matthias Wessendorf</li>
+</ul>
+<h2 id="vote-to-join-the-incubator-4122011">Vote to join the Incubator (4.12.2011)</h2>
+<p>Gerhard Petracek started the official [vote|http://s.apache.org/h8].</p>
+<h2 id="proposal-30112011">Proposal (30.11.2011)</h2>
+<p>After some discussions between the teams (of Apache MyFaces CODI, Seam3 and CDISource), Mark Struberg submitted the [proposal|http://wiki.apache.org/incubator/DeltaSpikeProposal]. Since Spike couldn't be used as project-name, we agreed on DeltaSpike as initial code name (delta because it closes several gaps).</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/project-name.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/project-name.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/project-name.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,122 @@
+<!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 - Where the name &#39;DeltaSpike&#39; comes from</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>Where the name &#39;DeltaSpike&#39; comes from</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>
+<p>Please note that we can't use some of the following names due to existing trademarks. However, maybe they lead to new ideas.</p>
+<p>The following names came up during the initial discussion:
+<em> Alopex
+</em> Bond
+<em> Boost
+</em> Butterfly
+<em> Calero
+</em> CDIflow
+<em> Codejoint
+</em> Codelink
+<em> Codelynx
+</em> Codeplug
+<em> Cofusion
+</em> CoJack
+<em> Compbox
+</em> Compfusion
+<em> Elements
+</em> Framelink
+<em> Giant Leap
+</em> Icabu
+<em> Icalero
+</em> Infusion
+<em> Jump
+</em> Karakal
+<em> Kiwani
+</em> Kolec
+<em> Kolek
+</em> Mescalero
+<em> OverBoost
+</em> Overpass
+<em> Pack
+</em> Punta
+<em> Push
+</em> Rih
+<em> SourceGang
+</em> Spansion
+<em> SquareKnot
+</em> StimPak
+<em> Sungila
+</em> Tayra
+<em> Tigger
+</em> Toolbox
+<em> Toolbox
+</em> Ucalero
+<em> Viaduct
+</em> Zirkon</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/project-structure.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/project-structure.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/project-structure.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,94 @@
+<!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 - Project Structure</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>Project Structure</h1>
+        <h2 id="this-site-is-under-construction">This site is <em>under</em> <em>construction</em></h2>
+<h2 id="proposed-git-repository-structure">Proposed GIT repository structure</h2>
+<ul>
+<li>site</li>
+<li>buildtools
+** checkstyly-rules</li>
+<li>deltaspike
+<strong> impl
+<strong><em> core
+</em></strong><em> api
+<strong><em>* impl</em></strong></em> impl-bda // contains @DefaultBean</strong> test
+<strong><em> parents
+</em></strong>* embedded
+<strong><em>* integrated</em></strong> glassfish-3.1.1
+<strong><em> owb-embedded
+</em></strong> weld-embedded
+<strong><em> jbossas7
+** bundles
+</em></strong> jsf12
+<strong><em> jsf20
+</em></strong> core-se</li>
+</ul>
+
+    </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/release-preparation.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/release-preparation.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/release-preparation.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,85 @@
+<!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 - Reviewing an Apache Release</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>Reviewing an Apache Release</h1>
+        <p>Once a Release has been staged on [http://repository.apache.org] it must be reviewed by each PMC member +before+ casting his VOTE.</p>
+<p>The following points need to be checked:</p>
+<ul>
+<li>is the GPG signature fine?</li>
+<li>is there a source archive?</li>
+<li>can the source archive really be built?</li>
+<li>is there a correct LICENSE and NOTICE file in each artifact (both source and binary artifacts)?</li>
+<li>does the NOTICE file contain all necessary attributions?</li>
+<li>check the dependencies. We must not have any GPL dependencies and LGPL only if they are optional, etc! See [http://www.apache.org/legal/3party.html]</li>
+<li>do all the tests work?</li>
+<li>if there is a TCK to run, does it succeed?</li>
+<li>if there is a tag in the SCM, does it contain reproduceable sources?</li>
+</ul>
+
+    </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/resources/site.css
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/resources/site.css (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/resources/site.css Tue Jul  3 16:09:36 2012
@@ -13,13 +13,13 @@ h3 { font-size:1.11em; padding:1.22em 0 
 
 /*custom typography, fonts*/
 body {font-family: Times,"Times New Roman",serif;}
-h1, h2, h3, h4, h5, h6, #breadcrumb, #nav #projectname ul li a {
+body h1, h2, h3, h4, h5, h6, #breadcrumb, #nav #projectname ul li a {
     font-family: "Trebuchet MS",Verdana,sans-serif;
     font-weight: normal;
 }
 :visited {color: #531393;}
 
-#projectname { font-size:1.5em;}
+#projectname { font-size:1.2em;}
 
 
 #page {

Modified: websites/staging/deltaspike/trunk/content/deltaspike/security.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/security.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/security.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 - DeltaSpike Security Module</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="security-module">Security Module</h1>
-<h2 id="securitybinding-for-class-and-method-invocations">SecurityBinding for class and method invocations</h2>
+        <h1>DeltaSpike Security Module</h1>
+        <h2 id="securitybinding-for-class-and-method-invocations">SecurityBinding for class and method invocations</h2>
 <p>This feature of the security module functions by intercepting method calls, and performing a security check before invocation is allowed to proceed.</p>
 <p>In order to use the DeltaSpike security module, you must first have installed the proper dependencies into your POM file. Once this is complete, you may proceed to create a security parameter binding annotation. This is what we will use to add security behavior to our business classes and methods.</p>
 <div class="codehilite"><pre><span class="n">Create</span> <span class="n">the</span> <span class="n">SecurityBinding</span>

Modified: websites/staging/deltaspike/trunk/content/deltaspike/source.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/source.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/source.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 - Compiling DeltaSpike</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,13 +61,14 @@ under the License.
         <hr/>
 
     <div id="content-wrapper" class="container_16">
-        <h1></h1>
-        <h1 id="checking-out-from-github-repo-anonymous">Checking out from GitHub repo (anonymous)</h1>
+        <h1>Compiling DeltaSpike</h1>
+        <p>Users are welcome to checkout the Apache DeltaSpike sources and compile it from source.</p>
+<h2 id="checking-out-from-github-repo-anonymous">Checking out from GitHub repo (anonymous)</h2>
 <div class="codehilite"><pre><span class="n">gir</span> <span class="n">clone</span> <span class="n">git:</span><span class="sr">//gi</span><span class="n">thub</span><span class="o">.</span><span class="n">com</span><span class="sr">/apache/i</span><span class="n">ncubator</span><span class="o">-</span><span class="n">deltaspike</span><span class="o">.</span><span class="n">git</span> <span class="o">./</span>
 </pre></div>
 
 
-<h1 id="checking-out-for-members">Checking out for members</h1>
+<h2 id="checking-out-for-members">Checking out for members</h2>
 <div class="codehilite"><pre><span class="n">git</span> <span class="n">clone</span> <span class="n">https:</span><span class="sr">//gi</span><span class="n">thub</span><span class="o">.</span><span class="n">com</span><span class="sr">/apache/i</span><span class="n">ncubator</span><span class="o">-</span><span class="n">deltaspike</span> <span class="o">./</span>
 </pre></div>
 

Modified: websites/staging/deltaspike/trunk/content/deltaspike/spi.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/spi.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/spi.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 - DeltaSpike Service Provider Interface (SPI)</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="deltaspike-spi">DeltaSpike-SPI</h1>
-<h2 id="deactivatable">Deactivatable</h2>
+        <h1>DeltaSpike Service Provider Interface (SPI)</h1>
+        <h2 id="deactivatable">Deactivatable</h2>
 <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 <em>contact us</em> and we will fix it). This mechanism is only used for artifacts <em>like</em> implementations of ({{javax.enterprise.inject.spi.Extension}}) which <em>can't</em> be deactivated with std. CDI mechanisms.</p>
 <p>To deactivate a class it's required to implement {{ClassDeactivator}}. Returning 'false' or 'true' allows to de-/activate the class in question. Retuning null means that the current class-deactivator doesn't have information about the class in question and can't provide a result. Since {{ClassDeactivator}} implementations are configured with the low-level config of DeltaSpike, the class-deactivator with the highest ordinal has the final decision. DeltaSpike itself doesn't deactivate an implementation, however, an add-on or a 3rd party portable CDI extension based on DeltaSpike (Core+) can use the concept to deactivate a default implementation of DeltaSpike in favour of its own implementation. (<em>Attention</em>: due to the ordinal feature of the low-level config approach it's possible that a class-deactivator with a higher ordinal, e.g. used in a concrete project, can re-activate a deactivated implementation. <em>Please note</em> that you might have to deactivate the par
 ts of the add-on or 3rd party CDI extension which relies on its own implementation. Therefore, you should <em>be really careful with re-activation</em>.) The implementation should be stateless because the result will be cached and as soon as everything is initialized the class-deactivators won't be used any longer.</p>
 <div class="codehilite"><pre><span class="x">Deactivate classes via ClassDeactivator</span>

Added: websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,187 @@
+<!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 - </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></h1>
+        <h1 id="suggested-workflows">Suggested workflows</h1>
+<p>Feel free to add suggestions for workflows which lead to a clean history on the central clone. The description should be useful also for beginners to allow an easier start for new committers.</p>
+<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>
+<div class="codehilite"><pre><span class="n">Merge</span> <span class="n">branch</span> <span class="s">&#39;master&#39;</span> <span class="n">of</span> <span class="n">http:</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="o">/</span><span class="n">deltaspike</span> <span class="n">into</span> <span class="n">master</span>
+</pre></div>
+
+
+<h2 id="git-pull-rebase">git pull --rebase</h2>
+<p>An easy version for getting rid of the auto-merges is using </p>
+<div class="codehilite"><pre><span class="c">%&gt; git pull --rebase</span>
+</pre></div>
+
+
+<p>Please not that this sometimes trashes your working tree if there are unmergeable files around. Cleaning this up with a forced manual rebase is not something I'd recommend for a git beginner.</p>
+<h3 id="working-in-an-own-branch">working in an own branch</h3>
+<p>This is actually the suggested way to prevent auto-merges.</p>
+<p>Create an own branch where you do your feature work. Either do all your work in one branch or create one branch per feature you are working on.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git branch mybranch</span>
+</pre></div>
+
+
+<p>After you finished your feature, git-add and git-commit your work. Check with git-status that you don't have any dirty files and uncommitted changes around. You can use git-stash to 'backup' unfinished work.</p>
+<p>Then switch back to the master branch and pull changes done by other committers in the meantime.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git pull --rebase</span>
+</pre></div>
+
+
+<p>You should now get all the changes done by other committers and the will get applied to your local master branch.
+Now go back to your private branch and rebase your locally performed work to the HEAD of master.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout mybranch</span>
+<span class="c">%&gt; git rebase master</span>
+</pre></div>
+
+
+<p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;" added to those files. Resolve those conflicts manually, add them and finish the rebase.</p>
+<p>Check with git-status and gitk if the merge went well and the history now contains your changes.
+If all is well, go back to the master branch and merge your changes in.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git pull --rebase     // (just for safety, you should see no changes)</span>
+<span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git merge mybranch</span>
+</pre></div>
+
+
+<p>Finally you can push your changes to the ASF git repo</p>
+<div class="codehilite"><pre><span class="c">%&gt; git push</span>
+</pre></div>
+
+
+<h2 id="contribution-workflow">Contribution workflow</h2>
+<h3 id="creating-patches">Creating patches</h3>
+<p>You should use the following workflow if you plan to contribute patches or new features to DeltaSpike.</p>
+<p>First update you local copy of the repository:</p>
+<p>{code}
+  %&gt; git checkout master
+  %&gt; git pull --rebase
+{code}</p>
+<p>Then create a new local branch for your work. It's good practice to name it after the corresponding JIRA issue.</p>
+<p>{code}
+  %&gt; git checkout -b DELTASPIKE-XXX
+{code}</p>
+<p>Now you can start to work on your patch. When you are finished, commit your changes. But don't forget to add the name of the JIRA issue to the commit message.</p>
+<p>{code}
+  %&gt; git add -am "DELTASPIKE-XXX: Fixed some issue"
+{code}</p>
+<p>For small patches we recommend to do a single commit containing your changes. For larger contributions you should try to group your work into separate sub-tasks that you can commit one by one.</p>
+<p>Before you create your patch you should make sure that your local repository is up to date with the master repository. This is very important especially if you work on your branch for a long time. Use the following commands to pull the latest changes from the upstream repository and rebase your branch against the current master.</p>
+<p>{code}
+  %&gt; git checkout master
+  %&gt; git pull --rebase
+  %&gt; git checkout DELTASPIKE-XXX
+  %&gt; git rebase master
+{code}</p>
+<p>Now you are ready to create your patch:</p>
+<p>{code}
+  %&gt; git checkout DELTASPIKE-XXX
+  %&gt; git format-patch --stdout master &gt; ../DELTASPIKE-XXX.patch 
+{code}</p>
+<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
+<h3 id="applying-patches">Applying patches</h3>
+<p>If you are a committer and want to apply a patch you should do so in a separate branch.</p>
+<p>{code}
+  %&gt; git checkout -b DELTASPIKE-XXX
+{code}</p>
+<p>Then apply the patch using "git-am" and rebase it against the master branch.</p>
+<p>{code}
+  %&gt; git am &lt; ../DELTASPIKE-XXX.patch 
+  %&gt; git rebase master
+{code}</p>
+<p>After reviewing the changes and testing the code, the changes are ready to be merged into the master branch:</p>
+<p>{code}
+  %&gt; git checkout master
+  %&gt; git merge DELTASPIKE-XXX
+  %&gt; git branch -d DELTASPIKE-XXX
+{code}</p>
+<h2 id="discussion-workflow-optional">Discussion workflow (optional)</h2>
+<p>All discussions which lead to a decision take place on the mailing list. Sometimes it's required to show-case an idea esp. if the solution is more than few lines. As shown above it makes sense to use local branches for developing new parts. Git allows to push such local branches to a public repository. So it's easier to share it with the community for discussing it. The following listings show an example in combination with GitHub - for sure it works with any hosting platform like BitBucket, Google-Code,... The only important part here is that such branches <em>NEVER</em> get pushed to the main Apache repository to keep the commit history as clean as possible.</p>
+<p>{code:title=Initial setup}
+  %&gt; git clone https://git-wip-us.apache.org/repos/asf/incubator-deltaspike.git ./
+  %&gt; git remote add discuss https://[username]@github.com/[username]/[repo-name].git
+  %&gt; git push -u discuss master
+{code}</p>
+<p>{code:title=Branches for discussions}
+  %&gt; git checkout -b DELTASPIKE-XXX
+  //1-n commits
+  %&gt; git push discuss DELTASPIKE-XXX
+  //share the link to the branch for the discussions
+{code}</p>
+<p><em>If the community agrees on the suggested change, the implementation will be applied to the origin master. A committer has to follow the steps described above for the basic workflow to keep the commit history simple, clean and straight. A contributor has to follow the steps described above for creating a patch.</em></p>
+<p>{code:title=Delete the branch again}
+  %&gt;git push discuss :DELTASPIKE-XXX
+  %&gt;git branch -d DELTASPIKE-XXX
+{code}</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/supporters.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/supporters.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/supporters.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,104 @@
+<!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 - DeltaSpike supporters</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>DeltaSpike supporters</h1>
+        <p>Apache DeltaSpike gets support from many community members.</p>
+<h1 id="git-mirrors">Git Mirrors</h1>
+<p>Besides the official GitHub mirror there are the following mirrors:
+ * https://github.com/DeltaSpike/Mirror (+ the corresponding internal [Irian|http://www.irian.at] mirror for the sync.)</p>
+<h1 id="mailing-list-mirrors">Mailing-list Mirrors</h1>
+<ul>
+<li>[Markmail|http://incubator.markmail.org/search/?q=list%3Aorg.apache.incubator.deltaspike-dev]</li>
+<li>[Nabble|https://s.apache.org/deltaspike-dev_nabble]</li>
+</ul>
+<h1 id="integration-tests">(Integration) Tests</h1>
+<p>So far we test the following environments on a regular basis (daily ci build)</p>
+<ul>
+<li>Apache OpenWebBeans (embedded)
+   ** Apache build server</li>
+<li>JBoss Weld (embedded)
+   ** Apache build server</li>
+<li>JBoss AS7
+   ** [c4j|http://www.c4j.be]</li>
+<li>Glassfish 3.1.x
+   ** [c4j|http://www.c4j.be]</li>
+<li>Apache TomEE
+   ** Apache build server</li>
+</ul>
+<p>So far we test the following environments on a regular basis (manually)
+ * Weblogic Server 12c
+   ** [c4j|http://www.c4j.be]</p>
+<p>As soon as we have the corresponding config (and/or Arquillian Plugin)
+ * Apache Tomcat 7
+   <strong> DeltaSpike committers (manually)
+ * Jetty
+   </strong> DeltaSpike committers (manually)</p>
+<p><em>Feel free to support us</em> as well with new environments or with one of the environments we already check on a regular basis (to unburden/backup our existing supports).</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>

Added: websites/staging/deltaspike/trunk/content/deltaspike/tools.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/tools.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/tools.html Tue Jul  3 16:09:36 2012
@@ -0,0 +1,78 @@
+<!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 - Tool Configuration</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>Tool Configuration</h1>
+        <p>This page contains settings for various tools used at developing Apache DeltaSpike.</p>
+<h1 id="ide">IDE</h1>
+<h2 id="intellij">IntelliJ</h2>
+<p>[Attached|^settings.jar] you can find the settings for formatting the source code. Import them via File | Import Settings...</p>
+<h2 id="eclipse">Eclipse</h2>
+<p>For Eclipse you can use this [Code Formatter Profile|^deltaspike-code-conventions.xml]. Import it via Window | Preferences | Java | Code Style | Formatter</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>