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/08/10 18:23:58 UTC

svn commit: r828573 [8/8] - in /websites/staging/deltaspike/trunk/content: ./ deltaspike/ deltaspike/resources/ deltaspike/resources/css/ deltaspike/resources/images/ deltaspike/resources/js/

Added: websites/staging/deltaspike/trunk/content/deltaspike/se-features-ranking.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/se-features-ranking.html (added)
+++ websites/staging/deltaspike/trunk/content/deltaspike/se-features-ranking.html Fri Aug 10 16:23:56 2012
@@ -0,0 +1,197 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
+    <title>Apache DeltaSpike - Features for JavaSE</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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
+</head>
+
+<body>
+
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
+        </div>
+    </div>
+</div>
+
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>Features for JavaSE</h2>
+              <p><p>This page is a starting point for the discussions to merge features of MyFaces CODI and Seam3. This page just ranks <em>features which are available for JavaSE applications</em> and the only dependency is the API of CDI.</p>
+<p>The donating teams list <em>all</em> features of the corresponding code-base and rank them based on the priority for DeltaSpike (priority: 1...low - 10...high).
+In the 2nd column place a 'y' if a feature is important but the concept should be changed a bit for DeltaSpike. Placing a 'n' doesn't mean that the implementation won't change - it's just about the basic concept.
+A team places a 'x' in the 4th column of the other project, if there are basic objections about the <em>concept</em> itself.
+The ranking as well as the objections will be discussed on the dev list.</p>
+<p>This list does also contain a few Utils methods which will most times be of public interest and thus be served in the +api+ modules.</p>
+<h1 id="myfaces-codi-feature-ranking">MyFaces CODI feature ranking</h1>
+<h2 id="core">Core</h2>
+<p>|| Feature || "Requires" concept changes || Ranking || Objections || Discussion finished
+| BeanManagerProvider | n | 10 | | (+) |
+| ProjectStage | n | 10 | | (+) |
+| Deactivatable | n | 10 | |  (+) |
+| ProjectStageActivated | n | 10 | | (+) |
+| ExpressionActivated | n | 10 | | (+) |
+| ClassloaderUtils | y (needs tweaking: collection of ClassLoader related standard java stuff) | 10 |
+| CodiConfig | n (we can remove the workarounds we introduced for weld &lt; v1.1.4). Code must get cleaned up and reviewed. | 9 | | (+) |
+| ServiceProvider | y (use the version of owb instead) | 9 | | (+) |
+| AccessDecisionVoter | postponed | 9 |
+| @Secured | postponed ( y) | 9 |
+| Logger | postponed | 8 | we should generally discuss if CDI Loggers are useful. |
+| Startup logging of module config | postponed | 8 |
+| @InvocationOrder | postponed | 7 |
+| ClassDeactivator | y | 7 | | (+) |
+| StartupEventBroadcaster | postponed | 7 |
+| ...resource. * | postponed | 6 |
+| StartupEvent | postponed ( y) | 5 |
+| BeanNames | n | 3 | | (+) |
+| @Advanced | postponed ( y) | 2 |
+| @Enhanced | postponed ( y) | 2 |
+| Aggregatable | y | 2 | | (+)
+| DefaultAnnotation | n | overlap | | (+) (will be continued at AnnotationInstanceProvider) |
+| rest of ...config.* | postponed |
+| ViewNavigationHandler | postponed |
+| ...scope.* | postponed |</p>
+<p>You can find details at:
+ * [https://cwiki.apache.org/confluence/display/EXTCDI/Core+Usage]
+ * [https://cwiki.apache.org/confluence/display/EXTCDI/Core+Config+and+SPI]
+ * [https://cwiki.apache.org/confluence/display/EXTCDI/Core+DevDoc]</p>
+<h2 id="i18n-module">I18n Module</h2>
+<p>|| Feature || "Requires" concept changes || Ranking || Objections ||</p>
+<p>(discussion postponed)</p>
+<h1 id="seam3-feature-ranking">Seam3 feature ranking</h1>
+<h2 id="solder">Solder</h2>
+<p>|| Feature || "Requires" changes || Ranking || Objections || Discussion finished ||
+| [@Veto|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/Veto.java] | n | 10 | | (+) |
+| [@Requires|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/Requires.java] | y clean up, possibly rework for OWB. | 10 | x (behaviour non-spec conform; doesn't work with OWB and Resin)| (+) |
+| [javax.enterprise.inject.spi.Bean metadata implementations / utils|https://github.com/seam/solder/tree/develop/impl/src/main/java/org/jboss/solder/bean] | y(@DefaultBean is only needed for some CDI-1.0 containers if BDA is enabled - should get moved into an own jar) | 10 | | (+) / (-) still more to talk about
+| [Reflection utilities|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/reflection] | n | 9 | I think we could consolidate things a bit with what's in MyFaces CODI |
+| [Properties|https://github.com/seam/solder/tree/develop/impl/src/main/java/org/jboss/solder/properties] | n | 7 |
+| [Logging|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/logging] | n - probably need more impls | 7 | Currently based on JBoss logging, need to investigate changing to some other logging API (slf4j?).  Provides typesafe logging feature, which is important. |
+| [Unwrap|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/unwraps] | n | 5 |
+| [ServiceHandler|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/serviceHandler] | n - We've talked about doing a Binding approach though like interceptors | 5 |
+| [@System|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/System.java] | n Could be part of resources | 4 |
+| [ResourceLoader|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/resourceLoader] | n | 4 |
+| [@Exact|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/Exact.java] | n | 3 |
+| [Messages &amp; i18n|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/messages] | postponed | 3 |
+| [@FullyQualified|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/FullyQualified.java] | n | 2 |
+| [@ExtensionManaged|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/ExtensionManaged.java] | n | 2 |
+| [VersionLoggerUtil|https://github.com/seam/solder/blob/develop/api/src/main/java/org/jboss/solder/core/VersionLoggerUtil.java] | n | 2 |
+| [Generic Beans|https://github.com/seam/solder/tree/develop/impl/src/main/java/org/jboss/solder/bean/generic] | y - need a better impl for hierarchical servers | up for debate |</p>
+<p>[Solder documentation|http://docs.jboss.org/seam/3/latest/reference/en-US/html/pt01.html] not everything is completely documented as well as it ought to be :-( but between that and the links to the source should be enough.</p>
+<h3 id="non-core-solder-parts">Non Core Solder Parts</h3>
+<p>|| Feature || "Requires" changes || Ranking || Objections ||
+| Seam Config both xml and possible Java based \ | n | 10 |
+| [Seam Catch|https://github.com/seam/solder/tree/develop/api/src/main/java/org/jboss/solder/exception] | n | 9 |
+\</p>
+<h1 id="misc">Misc</h1>
+<h2 id="interdyn">InterDyn</h2>
+<p>see https://github.com/struberg/InterDyn</p>
+<h1 id="approved-features-of-myfaces-codi-for-deltaspike">Approved features of MyFaces CODI for DeltaSpike</h1>
+<h2 id="core_1">Core</h2>
+<p>|| Feature || Comment || Initial impl. finished || Tests finished || JavaDoc finished || Documentation finished || Review finished
+| BeanManagerProvider | we move the util methods to BeanProvider | (+) | (+) | (+) | (+) | (+) |
+| BeanProvider | | (+) | (+) | (+) | (+) | (+) |
+| ProjectStage | | (+) | (+) | (+) | (+) | (+) |
+| Deactivatable | | (+) | (+) | (+) | (+) | (+) |
+| ProjectStageActivated | see Exclude | - | - | - | - | - |
+| ExpressionActivated | see Exclude | - | - | - | - | - |</p>
+<h1 id="approved-features-of-seam3-for-deltaspike">Approved features of Seam3 for DeltaSpike</h1>
+<h2 id="solder_1">Solder</h2>
+<table>
+<thead>
+<tr>
+<th></th>
+<th>Feature</th>
+<th></th>
+<th>Comment</th>
+<th></th>
+<th>Initial impl. finished</th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Veto</td>
+<td>see Exclude</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+</tr>
+</tbody>
+</table>
+<h1 id="new-and-approved-deltaspike-features">New and approved DeltaSpike features</h1>
+<h2 id="core_2">Core</h2>
+<p>|| Feature || Comment || Initial impl. finished || Tests finished || JavaDoc finished || Documentation finished || Review finished
+| Exclude | further discussions about the naming are needed.) | (+) | (+) | (-) | (+) | (-) |</p></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
+
+</body>
+</html>
\ No newline at end of file

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 Fri Aug 10 16:23:56 2012
@@ -1,68 +1,59 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <title>Apache DeltaSpike - DeltaSpike Security Module</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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <div id="content-wrapper" class="container_16">
-        <h1>DeltaSpike Security Module</h1>
-        <h2 id="securitybinding-for-class-and-method-invocations">SecurityBinding for class and method invocations</h2>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>DeltaSpike Security Module</h2>
+              <p><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>
@@ -249,12 +240,38 @@ It's a basic hook to integrate a custom 
 <h2 id="accessdecisionvotercontext">AccessDecisionVoterContext</h2>
 <p>[TODO]</p>
 <h2 id="securitystrategy-spi">SecurityStrategy SPI</h2>
-<p>[TODO]</p>
+<p>[TODO]</p></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file

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 Fri Aug 10 16:23:56 2012
@@ -1,68 +1,59 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <title>Apache DeltaSpike - Compiling 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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <div id="content-wrapper" class="container_16">
-        <h1>Compiling DeltaSpike</h1>
-        <p>Users are welcome to checkout the Apache DeltaSpike sources and compile it from source.</p>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>Compiling DeltaSpike</h2>
+              <p><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>
@@ -70,12 +61,38 @@ under the License.
 
 <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>
+</pre></div></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file

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 Fri Aug 10 16:23:56 2012
@@ -1,68 +1,59 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <title>Apache DeltaSpike - DeltaSpike Service Provider Interface (SPI)</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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <div id="content-wrapper" class="container_16">
-        <h1>DeltaSpike Service Provider Interface (SPI)</h1>
-        <h2 id="deactivatable">Deactivatable</h2>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>DeltaSpike Service Provider Interface (SPI)</h2>
+              <p><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>
@@ -104,12 +95,38 @@ The method {{isActivated}} needs to be c
 
 <p>Instead of configuring the alternative in the beans.xml, a global alternative needs to be configured in /META-INF/apache-deltaspike.properties. CDI 1.1 should fix this issue and migrating to it means to remove the config entry for DeltaSpike again and move to the std. CDI config approach.</p>
 <div class="codehilite"><pre><span class="n">custom</span><span class="o">.</span><span class="n">CustomBean</span><span class="o">=</span><span class="n">custom</span><span class="o">.</span><span class="n">AlternativeCustomBean</span>
-</pre></div>
+</pre></div></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/suggested-git-workflows.html Fri Aug 10 16:23:56 2012
@@ -1,68 +1,59 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <div id="content-wrapper" class="container_16">
-        <h1></h1>
-        <h1 id="suggested-workflows">Suggested workflows</h1>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2></h2>
+              <p><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.
@@ -176,12 +167,38 @@ If all is well, go back to the master br
 <p>{code:title=Delete the branch again}
   %&gt;git push discuss :DELTASPIKE-XXX
   %&gt;git branch -d DELTASPIKE-XXX
-{code}</p>
+{code}</p></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/deltaspike/supporters.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/supporters.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/supporters.html Fri Aug 10 16:23:56 2012
@@ -1,68 +1,59 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <div id="content-wrapper" class="container_16">
-        <h1>DeltaSpike supporters</h1>
-        <p>Apache DeltaSpike gets support from many community members.</p>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>DeltaSpike supporters</h2>
+              <p><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>
@@ -93,12 +84,38 @@ under the License.
    <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>
+<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></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file

Modified: websites/staging/deltaspike/trunk/content/deltaspike/tools.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/deltaspike/tools.html (original)
+++ websites/staging/deltaspike/trunk/content/deltaspike/tools.html Fri Aug 10 16:23:56 2012
@@ -1,78 +1,95 @@
-<!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>
+<!DOCTYPE html>
+<html lang="en">
 <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"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="deltaspike-generate-pages">
+    <meta name="author" content="chm">
+
     <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. -->
+
+    <!-- Le styles -->
+    <link href="resources/css/bootstrap.css" rel="stylesheet">
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
 </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>
+<body>
 
-        <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 class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="home.html"><img src="resources/images/deltaspike-logo-medium.png"/></a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="home.html">Home</a></li>
+                    <li><a href="documentation.html">Documentation</a></li>
+                    <li><a href="dwonload.html">Download</a></li>
+                    <li><a href="community.html">Community</a></li>
+                    <li><a href="support.html">Support</a></li>
+                </ul>
+            </div><!--/.nav-collapse -->
         </div>
-        <hr/>
+    </div>
+</div>
 
-    <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>
+    <div class="container">
+      <div class="row">
+          <div class="span12">
+              <h2>Tool Configuration</h2>
+              <p><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>
+<p>For Eclipse you can use this [Code Formatter Profile|^deltaspike-code-conventions.xml]. Import it via Window | Preferences | Java | Code Style | Formatter</p></p>
+              <p><a class="btn" href="getting-started.html#">View details »</a></p>
+          </div>
+      </div>
+
+      <hr>
+
+      <footer>
+        <p>Copyright © 20011-2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</p>
+        <p>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="./bootstrap-navbar-1column_files/jquery.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-transition.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-alert.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-modal.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-dropdown.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-scrollspy.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tab.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-tooltip.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-popover.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-button.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-collapse.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-carousel.js"></script>
+    <script src="./bootstrap-navbar-1column_files/bootstrap-typeahead.js"></script>
+
+  
 
-    </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>
+</html>
\ No newline at end of file