deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rafab...@apache.org
Subject deltaspike git commit: DELTASPIKE-722 Migrate site to asciidoc and git
Date Fri, 12 Dec 2014 18:29:01 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 15cabd2f1 -> 2ed422f16


DELTASPIKE-722 Migrate site to asciidoc and git


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2ed422f1
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2ed422f1
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2ed422f1

Branch: refs/heads/master
Commit: 2ed422f16de174951f5798479ee40c613ca71fc6
Parents: 15cabd2
Author: Rafael Benevides <rafabene@gmail.com>
Authored: Fri Dec 12 16:27:14 2014 -0200
Committer: Rafael Benevides <rafabene@gmail.com>
Committed: Fri Dec 12 16:27:14 2014 -0200

----------------------------------------------------------------------
 documentation/README.md                         |   8 +-
 documentation/pom.xml                           |  25 +-
 .../asciidoc/releasenotes/deltaspike_1.0.2.adoc |  84 ------
 .../asciidoc/releasenotes/deltaspike_1.0.3.adoc |  97 ------
 .../src/main/asciidoc/steps_for_a_release.adoc  | 222 --------------
 .../src/main/template/document.html.erb         | 102 -------
 site/README.md                                  |  51 ++++
 site/pom.xml                                    | 133 +++++++++
 site/src/main/asciidoc/community.adoc           | 149 ++++++++++
 site/src/main/asciidoc/documentation.adoc       |  68 +++++
 site/src/main/asciidoc/download.adoc            |  82 ++++++
 site/src/main/asciidoc/examples.adoc            |  22 ++
 site/src/main/asciidoc/javadoc.adoc             |  51 ++++
 site/src/main/asciidoc/migration-guide.adoc     | 127 ++++++++
 site/src/main/asciidoc/news.adoc                | 292 +++++++++++++++++++
 site/src/main/asciidoc/release-preparation.adoc |  28 ++
 site/src/main/asciidoc/steps_for_a_release.adoc | 222 ++++++++++++++
 .../main/asciidoc/suggested-git-workflows.adoc  | 218 ++++++++++++++
 template/document.html.erb                      | 100 +++++++
 19 files changed, 1572 insertions(+), 509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/README.md
----------------------------------------------------------------------
diff --git a/documentation/README.md b/documentation/README.md
index 2b18089..d894c9a 100644
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -40,8 +40,12 @@ Put the following information in your ~/.m2/settings.xml file
       <password><YOUR_PASSWORD></password>
     </server>
 
-Then run:
+To publish to [staging area](http://deltaspike.apache.org/staging/documentation), run:
 
-    mvn site-deploy
+    mvn clean site-deploy -Pstaging
+
+To publish to [production area](http://deltaspike.apache.org/documentation), run:
+
+    mvn clean site-deploy
 
 After log in to <https://cms.apache.org/deltaspike/publish> and click on the `Submit` button.

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/documentation/pom.xml b/documentation/pom.xml
index c2cd926..95af534 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -37,6 +37,7 @@
 	<properties>
 		<asciidoctor.version>1.5.0</asciidoctor.version>
 		<svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/documentation/</svn.scmPubUrl>
+		<svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/documentation/</svn.scmPubUrlStaging>
 		<svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
 	</properties>
 
@@ -67,11 +68,12 @@
 					<outputDirectory>${project.build.directory}/site</outputDirectory>
 					<sourceHighlighter>coderay</sourceHighlighter>
 					<backend>html</backend>
-					<templateDir>src/main/template</templateDir>
+					<templateDir>../template</templateDir>
 					<eruby>erb</eruby>
-                    <preserveDirectories>true</preserveDirectories>
+					<preserveDirectories>true</preserveDirectories>
 					<attributes>
 						<toc>true</toc>
+            <basedir>..</basedir>
 					</attributes>
 				</configuration>
 			</plugin>
@@ -108,4 +110,23 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<!-- Profile used to publish documentation under staging folder. -->
+			<id>staging</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-scm-publish-plugin</artifactId>
+						<version>1.1</version>
+						<configuration>
+							<pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.2.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.2.adoc b/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.2.adoc
deleted file mode 100644
index 234cd69..0000000
--- a/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.2.adoc
+++ /dev/null
@@ -1,84 +0,0 @@
-= DeltaSpike Release Notes v1.0.2
-
-:toc:
-
-== Announcement
-
-The DeltaSpike team is proud to announce the release of v1.0.2.  See http://apache-deltaspike-incubator-discussions.2316169.n4.nabble.com/ANNOUNCE-Release-of-Apache-DeltaSpike-1-0-2-td4658671.html[our release announcement email^] for additional information.
-
-Please read our <<index.adoc#_getting_started,setup guide>> to add DeltaSpike to your application.
-
-== Highlights
-
-=== Code Changes
-
-  - Improvements in CDI Container Control module, in a few scenarios you could generate `NullPointerExceptions` in case of bad configuration
-  - Added a platform inspecific Servlet Listener for container control in embedded servlet runtimes
-  - Performance improvements in our JSF module
-    - Re-use of StringBuilder for ClientWindow generation
-    - Re-use of Maps for actionUrls
-  - When shutting down via `CdiContainer.shutdown` it will attempt to stop all contexts for you
-  - Improvements in JSF and Security integration, including
-    - Removed duplicate handling of exceptions
-    - Guarding against cases when `FacesContext` is null
-  - The data module now includes valid OSGi headers
-
-=== Documentation Changes
-
-Several important documentation changes went in as well
-
-  - Fix the Bean Validation module's package name when specifying the `ConstraintValidatorFactory`
-  - Document how to handle prevention of double form submission
-
-== Credits & Thanks
-
-  - Thanks to all those that contributed via https://www.openhub.net/p/DeltaSpike/contributors?query=&sort=latest_commit[OpenHub^]
-  - Thanks to those who reviewed and http://markmail.org/message/uvq62i4iioapkto2[voted^] on the release
-
-== Full Release Notes
-++++
-<h3>        Bug
-</h3>
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-637'>DELTASPIKE-637</a>] -         duplicated handling of AccessDeniedException
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-672'>DELTASPIKE-672</a>] -         Wrong Bean Validation artifactId on documentation
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-679'>DELTASPIKE-679</a>] -         NPE in BeanManagerProvider if parentClassLoader is null
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-681'>DELTASPIKE-681</a>] -         Handling AccessDeniedException will run the secured method
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-684'>DELTASPIKE-684</a>] -         No OSGi headers in deltaspike-partial-bean-module-api
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-685'>DELTASPIKE-685</a>] -         Guard against null FacesContext in Exception Handler Bridge
-    </li>
-</ul>
-
-<h3>        Improvement
-</h3>
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-506'>DELTASPIKE-506</a>] -         [perf] use a shared StringBuilder
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-509'>DELTASPIKE-509</a>] -         [perf] cache map in DefaultClientWindow#getQueryURLParameters
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-653'>DELTASPIKE-653</a>] -         Provide a platform inspecific servlet listener
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-665'>DELTASPIKE-665</a>] -         Add utility method to always get new context control.
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-666'>DELTASPIKE-666</a>] -         Improve BeanManager consistency
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-669'>DELTASPIKE-669</a>] -         Try to shutdown contexts when shutting down container
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-676'>DELTASPIKE-676</a>] -         ServletContext is available for injection before EventBridgeContextListener
-    </li>
-</ul>
-
-<h3>        Task
-</h3>
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-641'>DELTASPIKE-641</a>] -         Document prevent double submit feature
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-689'>DELTASPIKE-689</a>] -         release notes for v1.0.2
-    </li>
-</ul>
-++++
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.3.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.3.adoc b/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.3.adoc
deleted file mode 100644
index 4d6b8b2..0000000
--- a/documentation/src/main/asciidoc/releasenotes/deltaspike_1.0.3.adoc
+++ /dev/null
@@ -1,97 +0,0 @@
-= DeltaSpike Release Notes v1.0.3
-
-:toc:
-
-== Announcement
-
-The DeltaSpike team is proud to announce the release of v1.0.3.  See http://apache-deltaspike-incubator-discussions.2316169.n4.nabble.com/ANNOUNCE-Release-of-Apache-DeltaSpike-1-0-3-td4659029.html[our release announcement email^] for additional information.
-
-Please read our <<index.adoc#_getting_started,setup guide>> to add DeltaSpike to your application.
-
-== Highlights
-
-=== Code Changes
-
-  - Multiple improvements and fixes to our JSF Support
-    - Fixes around client window handling with JSF Native & Primefaces AJAX
-    - Window ID handling now works properly with lazy configuration
-  - Exception handling has been improved; better cross module support, JSF integration for Exceptions is improved.
-  - CDI versions are no longer included directly in any profile, to help with running applications against CDI 1.1/1.2 runtimes
-  - `BeanManagerProvider` will automatically use a child's classloader for `BeanManager` detection in case none found for the parent.
-
-=== Documentation Changes
-
-Several important documentation changes went in as well
-
-  - Scope availability in the core module
-  - Documentation around Security and PicketLink
-  - The first steps to moving our documentation to asciidoc has been performed
-
-== Credits & Thanks
-
-  - Thanks to all those that contributed via https://www.openhub.net/p/DeltaSpike/contributors?query=&sort=latest_commit[OpenHub^]
-  - Thanks to those who reviewed and http://apache-deltaspike-incubator-discussions.2316169.n4.nabble.com/VOTE-Release-of-Apache-DeltaSpike-1-0-3-td4658987.html[voted^] on the release
-
-== Full Release Notes
-++++
-<h3>        Bug
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-696'>DELTASPIKE-696</a>] -         Remove unneeded dependencies on CDICtrl Servlet
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-706'>DELTASPIKE-706</a>] -         Multiple CDI API versions on classpath in JSF module tests (Weld)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-710'>DELTASPIKE-710</a>] -         Error using clientWindow and (p|f):ajax
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-717'>DELTASPIKE-717</a>] -         Exception handlers not invoked when @Secured ViewConfig is violated in an app with JSF module without a DefaultErrorView page
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-719'>DELTASPIKE-719</a>] -         Only one voter invoked if multiple voters are applied through a stereotype
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-723'>DELTASPIKE-723</a>] -         Exception bypassing on JSF conversion errors
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-726'>DELTASPIKE-726</a>] -         Lazy window handling doesn&#39;t recognize new windows anymore
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-729'>DELTASPIKE-729</a>] -         f:viewAction is executed twice with LAZY window handling mode
-</li>
-</ul>
-
-<h3>        Improvement
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-692'>DELTASPIKE-692</a>] -         workaround for tests which don&#39;t use optional classes
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-699'>DELTASPIKE-699</a>] -         Signature relaxing of attribute method() in CriteriaSupport
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-708'>DELTASPIKE-708</a>] -         Veto the AbstractEntityRepository class
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-712'>DELTASPIKE-712</a>] -         BeanManagerProvider : Wrap usage in parent class loaders
-</li>
-</ul>
-
-<h3>        New Feature
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-702'>DELTASPIKE-702</a>] -         Add support to GreaterThan and LessThan in criteria to dates
-</li>
-</ul>
-
-<h3>        Task
-</h3>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-640'>DELTASPIKE-640</a>] -         Document Scopes in Core module
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-677'>DELTASPIKE-677</a>] -         document ds-security in combination with picketlink
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-697'>DELTASPIKE-697</a>] -         Set the baseDir to reside in the target directory for tomcat tests.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-698'>DELTASPIKE-698</a>] -         re-visit glassfish4 profile
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-711'>DELTASPIKE-711</a>] -         Create placeholder documentation directory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-716'>DELTASPIKE-716</a>] -         Migrate documentation format to asciidoc at git repo
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/DELTASPIKE-730'>DELTASPIKE-730</a>] -         release notes for v1.0.3
-</li>
-</ul>
-
-++++
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/src/main/asciidoc/steps_for_a_release.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/steps_for_a_release.adoc b/documentation/src/main/asciidoc/steps_for_a_release.adoc
deleted file mode 100644
index 2a00bf3..0000000
--- a/documentation/src/main/asciidoc/steps_for_a_release.adoc
+++ /dev/null
@@ -1,222 +0,0 @@
-= Steps for a Release
-
-:Notice: 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.
-
-[TOC]
-
-== Preparations
-
- - Heads up on the mailing-lists
-
-e.g.:
-
------------------------------------------------------------------------------------------------------------------------
-first steps for the next release
-
-hi @ all,
-
-if there are no objections, i'll start with the first steps for the next release (review, documentation,...).
-it would be great to start with the release procedure next week.
-
-regards,
-[name]
------------------------------------------------------------------------------------------------------------------------
-
- - Check the documentation
- - Check https://analysis.apache.org/dashboard/index/87921
- - Check diff with tag of [version-1]
- - Check the jenkins builds
- - Create release notes and commit them to deltaspike/readme/ (format [ReleaseNotes][version].txt)
-
-
-test at least:
-
------------------------------------------------------------------------------------------------------------------------
-mvn clean install -POWB
-mvn clean install -PWeld
-mvn clean install -Prat
-mvn clean install -Ptomee-build-managed
-mvn clean install -Pjbossas-build-managed-7
-mvn clean install -Pwildfly-build-managed
-mvn clean install -Pglassfish-build-managed-3
------------------------------------------------------------------------------------------------------------------------
-
-deploy a demo app esp. with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
-(https://github.com/os890/ee6-ds-demo can be used for it e.g.)
-
-== First steps
-
------------------------------------------------------------------------------------------------------------------------
-//install a version of git which is compatible with the release-plugin (e.g. v1.8.3.2)
-git checkout -b deltaspike-[release version]
-
-mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
-
-//hint: don't use -DdryRun=true -- since it can break the next step
-mvn release:perform -Pdistribution -DreleaseProfiles=distribution
-
-//!!!check the created commits including user-name and email
-
-//login to https://repository.apache.org/ and go to "Staging Repositories"
-//check esp. .../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
-//close the repository
-
-//push the release-branch and tag to a 3rd party git repo
-git remote add vote https://github.com/[user]/deltaspike-vote
-git push -u vote master
-git push vote deltaspike-[release version]
-git push vote --tags
------------------------------------------------------------------------------------------------------------------------
-
-= Vote
-
-== Start the vote
-
-e.g.:
-
-
------------------------------------------------------------------------------------------------------------------------
-[VOTE] Release of Apache DeltaSpike [version]
-
-
-Hi,
-
-I was running the needed tasks to get the ... release of Apache DeltaSpike out.
-The artifacts are deployed to Nexus [1] (and [2]).
-
-The tag is available at [3] and will get pushed to the ASF repository once the vote passed.
-
-Please take a look at the ... artifacts and vote!
-
-Please note:
-This vote is "majority approval" with a minimum of three +1 votes (see [4]).
-
-------------------------------------------------
-[ ] +1 for community members who have reviewed the bits
-[ ] +0
-[ ] -1 for fatal flaws that should cause these bits not to be released, and why..............
-------------------------------------------------
-
-Thanks,
-[name]
-
-[1] https://repository.apache.org/content/repositories/...
-[2] https://repository.apache.org/content/repositories/.../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
-[3] https://github.com/[user]/deltaspike-vote/tree/deltaspike-project-[version]
-[4] http://www.apache.org/foundation/voting.html#ReleaseVotes
------------------------------------------------------------------------------------------------------------------------
-
-= Announce the vote
-
- - Create a link to the release notes at http://s.apache.org (format DeltaSpike_[version])
- - Tweet about the vote via @DeltaSpikeTeam.
-
-= Perform the final release
-
-== Close the vote
-
-After 72 hours close the vote.
-
-e.g.:
-
-
------------------------------------------------------------------------------------------------------------------------
-Result (was: Re: [VOTE] Release of Apache DeltaSpike [version])
-
-thank you for voting!
-
-X binding +1 votes (pmc):
-[list]
-
-Y non-binding +1 votes:
-[list]
-
-Z -1 votes
-[list]
------------------------------------------------------------------------------------------------------------------------
-
-
-If the binding majority approved the vote continue.
-
- - Login to https://repository.apache.org/ and release the repository
- - Merge release branch into master and push the branch and tag to the ASF repository
-
-
-Always do a merge in this case (not a rebase):
-
-
------------------------------------------------------------------------------------------------------------------------
-git checkout master
-git merge deltaspike-[version]
-git push origin deltaspike-[version]
-git push origin deltaspike-project-[version]
-git push origin master
------------------------------------------------------------------------------------------------------------------------
-
-
- - Create the release at jira
- - Close the corresponding tickets of the version
- - Wait some hours and check http://repo2.maven.org/maven2/org/apache/deltaspike
-
-
-
-== Upload artifacts
-
------------------------------------------------------------------------------------------------------------------------
-svn co https://dist.apache.org/repos/dist/release/deltaspike
-mkdir [version]
-//add and commit the artifacts (at least *source-release.zip + asc, md5, sha1)
------------------------------------------------------------------------------------------------------------------------
-
-== Check downloads
-
- - http://www.eu.apache.org/dist/deltaspike
- - http://www.us.apache.org/dist/deltaspike
-
-== Update site content
-
-via CMS:
-
- - Update download links: http://deltaspike.apache.org/download.html
- - Update news: http://deltaspike.apache.org/news.html
- - Update version: http://deltaspike.apache.org/index.html
-
-== Announce the Release
-
-=== E-Mails
-
-
------------------------------------------------------------------------------------------------------------------------
-[ANNOUNCE] Release of Apache DeltaSpike [version]
-
-The Apache DeltaSpike team is pleased to announce the 6th release of DeltaSpike.
-
-Apache DeltaSpike is not a CDI-container, but a portable CDI extension.
-
-Documentation:
-http://deltaspike.apache.org/documentation.html
-
-Download:
-http://deltaspike.apache.org/download.html
-
-Release Notes:
-http://s.apache.org/DeltaSpike_06
-
-Enjoy!
-
-[name]
------------------------------------------------------------------------------------------------------------------------
-
-Write the e-mails to:
-
- - announce@apache.org
- - dev@deltaspike.apache.org
- - users@deltaspike.apache.org
-
-=== Twitter
-
-e.g.:
-
------------------------------------------------------------------------------------------------------------------------
-[ANNOUNCE] The Apache #DeltaSpike team is pleased to announce http://s.apache.org/DeltaSpike_[version]. Feel free to test it! Feedback is very welcome!
------------------------------------------------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/documentation/src/main/template/document.html.erb
----------------------------------------------------------------------
diff --git a/documentation/src/main/template/document.html.erb b/documentation/src/main/template/document.html.erb
deleted file mode 100644
index 40bd8b7..0000000
--- a/documentation/src/main/template/document.html.erb
+++ /dev/null
@@ -1,102 +0,0 @@
-<%#encoding:UTF-8%><!DOCTYPE html>
-<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><%= document.name %></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. -->
-
-<!-- Styles -->
-
-<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
-<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
-
-<style type="text/css">
-<%= ::Asciidoctor::Stylesheets.instance.coderay_stylesheet_data %>
-body {
-	padding-top: 60px;
-	padding-bottom: 40px;
-}
-</style>
-<script type="text/javascript">
-
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', 'UA-36103647-1']);
-	  _gaq.push(['_trackPageview']);
-	
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	
-	</script>
-</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 logocolor"
-					href="http://deltaspike.apache.org/index.html">Apache
-					DeltaSpike</a>
-				<div class="nav-collapse">
-					<ul class="nav">
-						<li class="active"><a
-							href="http://deltaspike.apache.org/index.html">Home</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation">Documentation</a></li>
-						<li><a href="http://deltaspike.apache.org/javadoc.html">Javadoc</a></li>
-						<li><a href="http://deltaspike.apache.org/documentation/source.html">Source</a></li>
-						<li><a href="http://deltaspike.apache.org/download.html">Download</a></li>
-						<li><a href="http://deltaspike.apache.org/community.html">Community</a></li>
-						<!-- <li><a href="./support.html">Support</a></li>  -->
-						<li><a href="http://deltaspike.apache.org/news.html">News</a></li>
-						<li><a
-							href="http://deltaspike.apache.org/migration-guide.html">Migration</a></li>
-					</ul>
-				</div>
-				<!--/.nav-collapse -->
-				<form id="search-form" action="http://www.google.com/search"
-					method="get" class="navbar-search pull-right">
-					<input value="deltaspike.apache.org" name="sitesearch"
-						type="hidden"> <input class="search-query" name="q"
-						id="query" type="text">
-				</form>
-			</div>
-		</div>
-	</div>
-
-	<div class="container">
-		<div class="row">
-			<div class="span12">
-				<div class="page-title">
-			    <h1><%= document.name %></h1>
-                </div>
-
-				<div id="toc" class="<%= attr 'toc-class', 'toc' %>">
-       	 		<%= converter.convert_with_options @document, 'outline', :toclevels => 3  %>
-       	 		<hr>	
-       	 		
-				<%= document.content %>
-			</div>
-
-			<hr>
-
-			<footer>
-				<p>Copyright © 2011-2014 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 -->
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
new file mode 100644
index 0000000..47720ab
--- /dev/null
+++ b/site/README.md
@@ -0,0 +1,51 @@
+title: Apache DeltaSpike
+
+Notice:    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.
+
+DeltaSpike site
+---------------
+
+DeltaSpike site uses [Asciidoc](http://www.methods.co.nz/asciidoc/). You're welcome to contribute.
+
+License
+-------
+Apache DeltaSpike is licensed under ALv2.
+See the LICENSE file for the full license text.
+
+Publish procedure
+-----------------
+
+To publish the site content at [DeltaSpike Site](http://deltaspike.apache.org/) you have do the following steps:
+
+Put the following information in your ~/.m2/settings.xml file
+
+    <server>
+      <id>deltaspike-site</id>
+      <username><YOUR_USERNAME></username>
+      <password><YOUR_PASSWORD></password>
+    </server>
+
+To publish to [staging area](http://deltaspike.apache.org/staging/), run:
+
+    mvn clean site-deploy -Pstaging
+
+To publish to [production area](http://deltaspike.apache.org/), run:
+
+    mvn clean site-deploy
+
+After log in to <https://cms.apache.org/deltaspike/publish> and click on the `Submit` button.

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/pom.xml
----------------------------------------------------------------------
diff --git a/site/pom.xml b/site/pom.xml
new file mode 100644
index 0000000..c8649ad
--- /dev/null
+++ b/site/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<!-- 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. -->
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache</groupId>
+		<artifactId>apache</artifactId>
+		<version>11</version>
+	</parent>
+
+	<!-- * Please do not use this pom for other deltaspike modules. * Instead
+		use the one from parent/pom.xml! * * This very pom.xml contains only the
+		basic build layout * and no build-rules at all. See parent/pom.xml for all
+		* the dependencyManagement and plugin configuration stuff. -->
+	<groupId>org.apache.deltaspike</groupId>
+	<artifactId>deltaspike-site</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<name>Apache DeltaSpike - Site</name>
+	<description>
+    DeltaSpike website
+    </description>
+	<url>http://deltaspike.apache.org</url>
+
+	<properties>
+		<asciidoctor.version>1.5.0</asciidoctor.version>
+		<svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/</svn.scmPubUrl>
+		<svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/</svn.scmPubUrlStaging>
+		<svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
+	</properties>
+
+	<distributionManagement>
+		<site>
+			<id>apache.website</id>
+			<url>${svn.scmPubUrl}</url>
+		</site>
+	</distributionManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+				<version>${asciidoctor.version}</version>
+				<executions>
+					<execution>
+						<id>output-html</id>
+						<phase>site</phase>
+						<goals>
+							<goal>process-asciidoc</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<sourceDirectory>src/main/asciidoc</sourceDirectory>
+					<outputDirectory>${project.build.directory}/site</outputDirectory>
+					<sourceHighlighter>coderay</sourceHighlighter>
+					<backend>html</backend>
+					<templateDir>../template</templateDir>
+					<eruby>erb</eruby>
+					<preserveDirectories>true</preserveDirectories>
+					<attributes>
+						<toc>true</toc>
+            <basedir>.</basedir>
+					</attributes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-scm-publish-plugin</artifactId>
+				<version>1.1</version>
+				<executions>
+					<execution>
+						<id>scm-publish</id>
+						<phase>site-deploy</phase>
+						<!-- deploy site with maven-scm-publish-plugin -->
+						<goals>
+							<goal>publish-scm</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<content>${project.reporting.outputDirectory}</content>
+					<pubScmUrl>scm:svn:${svn.scmPubUrl}</pubScmUrl>
+					<tryUpdate>true</tryUpdate>
+          <skipDeletedFiles>true</skipDeletedFiles>
+					<checkoutDirectory>${svn.scmPubCheckoutDirectory}</checkoutDirectory>
+					<serverId>deltaspike-site</serverId>
+				</configuration>
+			</plugin>
+			<!-- this is a hack, to make site not really run. -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+					<skipDeploy>true</skipDeploy>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<!-- Profile used to publish documentation under staging folder. -->
+			<id>staging</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-scm-publish-plugin</artifactId>
+						<version>1.1</version>
+						<configuration>
+							<pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/community.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/community.adoc b/site/src/main/asciidoc/community.adoc
new file mode 100644
index 0000000..afe1760
--- /dev/null
+++ b/site/src/main/asciidoc/community.adoc
@@ -0,0 +1,149 @@
+= Community
+
+:Notice: 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.
+
+[TOC]
+
+
+== Introduction
+
+
+== Users
+
+
+If you are a new user and you would like to start using DeltaSpike, you
+can have a look at the link:documentation/[Documentation] and 
+mailto:users-subscribe@deltaspike.apache.org[subscribe] our
+mailto:users@deltaspike.apache.org[mailing list for users]. If you have
+troubles to find the information you are looking for, you can also ask
+in our link:#_irc[IRC-Channel].
+
+Furthermore, you can check our link:#_mailing_lists[mail-archives].
+
+Before you file a ticket in our
+https://issues.apache.org/jira/browse/DELTASPIKE[Jira], please ask on
+the mailing list if it's a known issue in case of a bug or if there is
+an ongoing discussion in case of a feature.
+
+You are very welcome to follow our twitter account
+http://twitter.com/DeltaSpikeTeam[@DeltaSpikeTeam] and spread the
+word of DeltaSpike with Tweets, Blog-Entries,...
+
+
+== Getting Involved
+
+
+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. The following sections
+provides some details about the different levels of getting involved.
+
+If you want to contribute with link:/documentation/[DeltaSpike
+Documentation], please read the <<documentation#,instructions
+about the Documentation>> that adresses how to contribute, render and
+publish it.
+
+
+=== Contributors
+
+
+Before you get a committer you have to contribute to our effort. E.g.
+you can help users, participate in discussions on the dev list, submit
+patches,... . Therefore, it's essential to file a/n
+http://www.apache.org/licenses/icla.txt[(I)CLA] or
+http://www.apache.org/licenses/cla-corporate.txt[CLA] and send it to
+secretary at apache dot org (or fax it) as early as possible.
+
+If you would like to submit a patch through Jira, you can have a look at
+the link:suggested-git-workflows.html[suggested approach].
+
+Here is the contributors/committers page:
+link:contributors.html[Contributors].
+
+
+=== Committers
+
+
+Before you read this section, please ensure that you have read the
+contributor section. All of you are welcome to join our development
+effort. mailto:dev-subscribe@deltaspike.apache.org[Subscribe] our
+mailto:dev@deltaspike.apache.org[mailing list for developers] and start
+contributing and help users.
+
+Optionally mailto:commits-subscribe@deltaspike.apache.org[subscribe] our
+mailto:commits@deltaspike.apache.org[mailing list for commits].
+
+Furthermore, you can check our
+link:#_mailing_lists[mail-archives].
+
+Further details are available at http://www.apache.org/dev/.
+
+
+== Mailing lists
+
+[.table]
+[cols="6*<", options="header"] 
+|===
+|List (Address) 
+|Subscribe 
+|Unsubscribe 
+|Archive 
+|Mirrors
+|
+
+|mailto:users@deltaspike.apache.org[User List]
+|mailto:users-subscribe@deltaspike.apache.org[Subscribe]
+|mailto:users-unsubscribe@deltaspike.apache.org[Unsubscribe]
+|http://mail-archives.apache.org/mod_mbox/deltaspike-users/[Archive]
+|http://apache-deltaspike-discussions.2316169.n4.nabble.com/[Nabble]
+|http://markmail.org/search/?q=list%3Aorg.apache.deltaspike-users+order%3Adate-backward[MarkMail]
+
+|mailto:dev@deltaspike.apache.org[Developer List]
+|mailto:dev-subscribe@deltaspike.apache.org[Subscribe]
+|mailto:dev-unsubscribe@deltaspike.apache.org[Unsubscribe]
+|http://mail-archives.apache.org/mod_mbox/deltaspike-dev/[Archive]
+|http://apache-deltaspike-discussions.2316169.n4.nabble.com/[Nabble]
+|http://markmail.org/search/?q=list%3Aorg.apache.deltaspike-dev+order%3Adate-backward[MarkMail]
+
+|mailto:commits@deltaspike.apache.org[Committer List]
+|mailto:commits-subscribe@deltaspike.apache.org[Subscribe]
+|mailto:commits-unsubscribe@deltaspike.apache.org[Unsubscribe]
+|http://mail-archives.apache.org/mod_mbox/deltaspike-commits/[Archive]
+|
+|
+|
+
+|===
+
+== JIRA
+
+Any kind of issue has to be filed in our
+https://issues.apache.org/jira/browse/DELTASPIKE[issue-tracker]. If you
+have any question, you can ask us (e.g. via the mailing list for users).
+
+
+== Spread the word
+
+
+You are very welcome e.g. to write blog entries, tweet (#DeltaSpike)
+about the project or just follow our twitter account
+http://twitter.com/DeltaSpikeTeam[@DeltaSpikeTeam], ...
+
+
+== IRC
+
+
+Usually discussions happen on the mailing list. Some informal
+discussions take place in our IRC-Channel
+irc://irc.freenode.net/deltaspike
+
+-------------------------------------
+//with the irssi command-line client:
+$ irssi
+
+> /connect irc.freenode.net
+> /join #deltaspike
+-------------------------------------
+
+If you are new to IRC you can use the pre-configures web-client you can
+find http://people.apache.org/~gpetracek/deltaspike/freenode.html[here].

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/documentation.adoc b/site/src/main/asciidoc/documentation.adoc
new file mode 100644
index 0000000..ea23050
--- /dev/null
+++ b/site/src/main/asciidoc/documentation.adoc
@@ -0,0 +1,68 @@
+= Documentation
+
+:Notice: 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.
+
+[TOC]
+
+
+== Sources
+
+link:/documentation/[DeltaSpike Documentation] is available with link:documentation/source.html[DeltaSpike Source].
+
+== Format
+
+The format used for DeltaSpike documentation is http://www.methods.co.nz/asciidoc/[ASCIIDOC] because it's easily
+exportable to PDF, HTML, and it's also easy to contribute. It can be used to export also to epub and also be used to write books
+
+== Rendering documentation as HTML
+
+
+_Requirenment:_ Have http://maven.apache.org/[Maven] installed.
+
+If you cloned the source repository and want to render the documentation
+as HTML, you just need to run the following command:
+
+----------------------------
+$ cd REPO_ROOT/documentation
+$ mvn site
+----------------------------
+
+The generate documentation will be available at `REPO_ROOT/documentation/target/site`
+
+== Contribute
+
+
+If you would like to submit a documentation patch through Jira, you can
+have a look at the <<suggested-git-workflows#,suggested approach>>.
+
+== Publish procedure (for committers only)
+
+
+If you're a committer and want to publish the documentation at http://deltaspike.apache.org/documentation/[DeltaSpike Site] you have do the following steps:
+
+Put the following information in your ~/.m2/settings.xml file
+
+[source,xml]
+--------------------------------------
+<server>
+  <id>deltaspike-site</id>
+  <username><YOUR_USERNAME></username>
+  <password><YOUR_PASSWORD></password>
+</server>
+--------------------------------------
+
+To publish to http://deltaspike.apache.org/staging/documentation[staging area], run:
+
+----------------------------
+$ mvn clean site-deploy -P staging
+----------------------------
+
+To publish to http://deltaspike.apache.org/staging/documentation[production area], run:
+
+-----------------
+$ mvn clean site-deploy
+-----------------
+
+Then run:
+
+After log in to https://cms.apache.org/deltaspike/publish and click on the `Submit` button.

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/download.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/download.adoc b/site/src/main/asciidoc/download.adoc
new file mode 100644
index 0000000..12fe121
--- /dev/null
+++ b/site/src/main/asciidoc/download.adoc
@@ -0,0 +1,82 @@
+= Download
+
+:Notice: 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.
+
+[TOC]
+
+
+== Latest Release
+
+
+v1.2.0
+
+
+== Binary Distribution
+
+
+* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/distribution-full-1.2.0.zip[distribution-full-1.2.0.zip]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.asc[distribution-full-1.2.0.zip.asc]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.md5[distribution-full-1.2.0.zip.md5]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.zip.sha1[distribution-full-1.2.0.zip.sha1]
+
+* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz[distribution-full-1.2.0.tar.gz]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.asc[distribution-full-1.2.0.tar.gz.asc]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.md5[distribution-full-1.2.0.tar.gz.md5]
+* http://www.apache.org/dist/deltaspike/1.2.0/distribution-full-1.2.0.tar.gz.sha1[distribution-full-1.2.0.tar.gz.sha1]
+
+
+== Source Distribution
+
+
+* http://www.apache.org/dyn/closer.cgi/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip[deltaspike-project-1.2.0-source-release.zip]
+* http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.asc[deltaspike-project-1.2.0-source-release.zip.asc]
+* http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.md5[deltaspike-project-1.2.0-source-release.zip.md5]
+* http://www.apache.org/dist/deltaspike/1.2.0/deltaspike-project-1.2.0-source-release.zip.sha1[deltaspike-project-1.2.0-source-release.zip.sha1]
+
+
+== Maven Dependencies
+
+
+Details are available http://deltaspike.apache.org/documentation/#_project_configuration_without_maven[here].
+
+
+== Previous Releases
+
+
+See http://archive.apache.org/dist/deltaspike/[Release-Archive]
+
+
+== Verifying Releases
+
+
+It is essential that you verify the integrity of any downloaded files
+using the PGP or MD5 signatures. For more information on signing
+artifacts and why we do it, check out the
+http://www.apache.org/dev/release-signing.html[Release Signing FAQ].
+
+The PGP signatures can be verified using PGP or GPG. First download the
+http://www.apache.org/dist/deltaspike/KEYS[KEYS] as well as the asc
+signature file for the artifact. Make sure you get these files from the
+http://www.apache.org/dist/deltaspike/[main distribution directory],
+rather than from a
+http://www.apache.org/dyn/closer.cgi/deltaspike/[mirror]. Then verify
+the signatures using e.g.:
+
+------------------------------------------------------
+$ pgpk -a KEYS
+$ pgpv deltaspike-project-1.2.0-source-release.zip.asc
+------------------------------------------------------
+
+or
+
+-----------------------------------------------------
+$ pgp -ka KEYS
+$ pgp deltaspike-project-1.2.0-source-release.zip.asc
+-----------------------------------------------------
+
+or
+
+--------------------------------------------------------------
+$ gpg --import KEYS
+$ gpg --verify deltaspike-project-1.2.0-source-release.zip.asc
+--------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/examples.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/examples.adoc b/site/src/main/asciidoc/examples.adoc
new file mode 100644
index 0000000..9e6fe7f
--- /dev/null
+++ b/site/src/main/asciidoc/examples.adoc
@@ -0,0 +1,22 @@
+= Examples 
+
+:Notice: 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.
+
+[TOC]
+
+== Introduction
+
+=== #1
+
+artifact-id: deltaspike-jse-owb-example (the shown use-cases also work
+with _Weld_ - only the bootstrapping of the container is different,
+because this example is based on Java-SE and therefore outside of an
+Java-EE(6+) application server.
+
+== External
+
+* https://github.com/os890/ee6-ds-demo[Fullstack EE6+ with DeltaSpike @os890 (tested with EE6 and EE7)]
+* http://s.apache.org/xA[Fullstack CODI to DeltaSpike @ os890]
+* https://github.com/jboss-developer/jboss-wfk-quickstarts[jboss-wfk-quickstarts(search for __deltaspike__)]
+* https://github.com/confess/confess2012_deltaspike[confess2012_deltaspike]
+

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/javadoc.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/javadoc.adoc b/site/src/main/asciidoc/javadoc.adoc
new file mode 100644
index 0000000..f32b6c0
--- /dev/null
+++ b/site/src/main/asciidoc/javadoc.adoc
@@ -0,0 +1,51 @@
+= Javadoc 
+
+:Notice: 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.
+
+[TOC]
+
+
+== Latest version
+
+* link:/javadoc/1.2.1-SNAPSHOT/[1.2.1-SNAPSHOT]
+
+
+== Stable Releases
+
+* link:/javadoc/1.2.0/[1.2.0]
+* link:/javadoc/1.1.0/[1.1.0]
+
+
+== Contribute
+
+If you would like to submit a javadoc patch through Jira, you can have a
+look at the <<suggested-git-workflows#,suggested approach>>.
+
+
+== Publish procedure (for committers only)
+
+
+If you're a committer and want to publish the javadoc, you have do the
+following steps:
+
+Put the following information in your ~/.m2/settings.xml file
+
+[source,xml]
+--------------------------------------
+<server>
+  <id>deltaspike-site</id>
+  <username><YOUR_USERNAME></username>
+  <password><YOUR_PASSWORD></password>
+</server>
+--------------------------------------
+
+Then run:
+
+
+[source,bash]
+-------------------------
+$ cd REPO_ROOT/deltaspike
+$ ./javadoc.sh
+-------------------------
+
+After log in to https://cms.apache.org/deltaspike/publish and click onthe `Submit` button.

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/migration-guide.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/migration-guide.adoc b/site/src/main/asciidoc/migration-guide.adoc
new file mode 100644
index 0000000..f067bca
--- /dev/null
+++ b/site/src/main/asciidoc/migration-guide.adoc
@@ -0,0 +1,127 @@
+= Migrate from MyFaces CODI-Core to DeltaSpike
+
+:Notice: 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.
+
+[TOC]
+
+
+== Introduction
+
+
+
+== Apache MyFaces CODI to Apache DeltaSpike
+
+=== Example Overview
+
+
+* http://s.apache.org/xA[Fullstack CODI to DeltaSpike @ os890]
+
+
+=== Basically unchanged parts
+
+
+Here you can see features which were added and the concept itself didn't change (only the packages, config keys,...)
+
+==== Project-stage
+
+
+Only the config key changed (TODO)
+
+
+==== Deactivatable and ClassDeactivator
+
+
+The concept hasn't changed.
+
+
+==== CodiConfig
+
+
+The concept hasn't changed.
+
+
+==== Annotation literals
+
+
+The concept hasn't changed. We just added further implementations.
+
+
+==== BeanManagerProvider
+
+
+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.
+
+
+=== Extended concepts
+
+
+Here you can see features which were added and the concept itself
+changed a bit or got merged with concepts from Seam3
+
+
+==== ConfiguredValueResolver
+
+
+Here we added more flexibility (esp. re-ordering the default lookup
+mechanisms). See `ConfigResolver`, `ConfigSourceProvider` and
+`ConfigSource`.
+
+
+==== ProjectStageActivated and ExpressionActivated
+
+
+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.
+
+
+==== DefaultAnnotation
+
+
+(In progress) We merge it with a similar helper of Seam-Solder to
+provide custom values for annotation attributes.
+
+
+=== Postponed concepts
+
+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.
+
+
+==== BeanNames
+
+
+
+=== Dropped concepts
+
+
+
+==== Java 1.5 Support
+
+
+
+=== JSF Module
+
+
+==== Type-safe view config
+
+
+* Changed names
+* Annotations are optional
+
+... (TODO)
+
+
+== JBoss Seam2 to Apache DeltaSpike
+
+
+(TODO)
+
+
+== JBoss Seam3 to Apache DeltaSpike
+
+
+(TODO)

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/news.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/news.adoc b/site/src/main/asciidoc/news.adoc
new file mode 100644
index 0000000..bcaa9bb
--- /dev/null
+++ b/site/src/main/asciidoc/news.adoc
@@ -0,0 +1,292 @@
+= Apache DeltaSpike News 
+
+:Notice: 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.
+
+[TOC]
+
+
+== Overview
+
+=== 13th Release (1.2.0) (30.11.2014)
+
+The Apache DeltaSpike team is pleased to announce the 13th release
+(v1.2.0).
+
+The http://s.apache.org/DeltaSpike_1.2.0[release notes] contains 22 JIRA tickets.
+
+
+
+=== New PMC Member (20.11.2014)
+
+Thomas Andraschko joined our PMC.
+
+
+
+=== 12th Release (1.1.0) (01.11.2014)
+
+
+The Apache DeltaSpike team is pleased to announce the 12th release (v1.1.0).
+
+The http://s.apache.org/DeltaSpike_1.1.0[release notes] contains 24 JIRA tickets.
+
+
+=== Duke's Choice Award (28.09.2014)
+
+We won a https://blogs.oracle.com/java/entry/2014_duke_s_choice_award[Duke's Choice Award]!
+
+
+=== 11th Release (1.0.3) (21.09.2014)
+
+
+The Apache DeltaSpike team is pleased to announce the 11th release (v1.0.3).
+
+The http://s.apache.org/DeltaSpike_1.0.3[release notes] contains 20 JIRA tickets.
+
+
+=== 10th Release (1.0.2) (17.08.2014)
+
+The Apache DeltaSpike team is pleased to announce the 10th release (v1.0.2).
+
+The http://s.apache.org/DeltaSpike_1.0.2[release notes] contains 15 JIRA tickets.
+
+
+=== 9th Release (1.0.1) (13.07.2014)
+
+
+The Apache DeltaSpike team is pleased to announce the 9th release (v1.0.1).
+
+The http://s.apache.org/DeltaSpike_1.0.1[release notes] contains 18 JIRA tickets.
+
+=== 8th Release (1.0.0) (14.06.2014)
+
+
+The Apache DeltaSpike team is pleased to announce the 8th release (v1.0.0).
+
+The http://s.apache.org/DeltaSpike_1.0.0[release notes] contains 48 JIRA tickets.
+
+=== New Committer (18.05.2014)
+
+Rafael Benevides joined our development community.
+
+
+=== 7th Release (0.7) (03.05.2014)
+
+
+The Apache DeltaSpike team is pleased to announce the 7th release (v0.7).
+
+The http://s.apache.org/DS-0.7-RNotes[release notes] contains 35 JIRA tickets.
+
+
+=== 6th Release (0.6) (20.03.2014)
+
+The Apache DeltaSpike team is pleased to announce the 6th release (v0.6).
+
+The http://s.apache.org/DS-0.6-RNotes[release notes] contains 102 JIRA tickets.
+
+
+=== New Committer (14.12.2013)
+
+Thomas Andraschko joined our development community.
+
+
+=== 5th Release (0.5) (18.09.2013)
+
+
+The Apache DeltaSpike team is pleased to announce the 5th release (v0.5).
+
+The http://s.apache.org/DS-0.5-RNotes[release notes] contains 29 JIRA tickets.
+
+
+=== 4th Release (0.4) (31.05.2013)
+
+
+The Apache DeltaSpike team is pleased to announce the fourth release (v0.4). 
+This is our first release as a top level project!
+
+The http://s.apache.org/DS-0.4-RNotes[release notes] contains a large list of bug fixes and new features.
+
+
+=== Graduation (28.05.2013)
+
+
+The Apache DeltaSpike team is pleased to announce that we have complete graduation as a top level project.
+
+
+=== 3rd Release (0.3 incubating) (22.08.2012)
+
+
+The Apache DeltaSpike team is pleased to announce the second release (v0.3-incubating).
+
+The http://s.apache.org/DeltaSpike_03incubating[release notes] contains 104 JIRA tickets.
+
+
+=== New Committer (21.08.2012)
+
+Bolesław Dawidowicz joined our development community.
+
+
+=== New Committers (11.07.2012)
+
+
+Charles Moulliard and Romain Manni-Bucau joined our development community.
+
+
+=== Apache CMS (30.05.2012)
+
+The setup of the project-site in Apache CMS started.
+
+
+=== 2nd Release (0.2 incubating) (22.04.2012)
+
+
+The Apache DeltaSpike team is pleased to announce the second release (v0.2-incubating).
+
+The http://s.apache.org/DeltaSpike_02incubating[release notes] contains 61 JIRA tickets.
+
+
+=== 1st Release (0.1 incubating) (10.02.2012)
+
+The Apache DeltaSpike team is pleased to http://s.apache.org/cTt[announce] the first release (v0.1-incubating).
+
+The first release contains about 5 000 lines of code (including tests and 10 000 including comments). The http://s.apache.org/DeltaSpike_01incubating[release notes] contains 42 JIRA tickets.
+
+
+=== Execution of integration tests with remote servers (01.02.2012)
+
+
+C4J helps us with nightly builds which deploy our integration tests to remote-servers (AS7 and GF3).
+
+=== New Committer (29.01.2012)
+
+
+Lukasz Lenart joined our development community.
+
+
+=== New Committer (28.01.2012)
+
+Christian Kaltepoth joined our development community.
+
+
+=== New Committer (27.01.2012)
+
+
+Rudy De Busscher joined our development community.
+
+
+=== Nabble Mirror (21.01.2012)
+
+
+Dan Allen created a http://s.apache.org/deltaspike-dev_nabble[Nabble mirror] for the dev-list (based on http://incubator.apache.org/mail/deltaspike-dev/)
+
+
+=== New Committers (13.01.2012)
+
+Dan Allen and Lincoln Baxter III are our first committers after the initial committers.
+
+
+=== GitHub Mirror (12.01.2012)
+
+
+The infra team created our mirror (https://github.com/apache/incubator-deltaspike)
+
+
+=== Creation of the Status Page (30.12.2011)
+
+
+We created an initial version of our status page (http://incubator.apache.org/guides/website.html)
+
+
+=== Nightly builds (29.12.2011)
+
+
+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/
+
+
+=== Sonar build (29.12.2011)
+
+Gavin McDonald did the Sonar setup
+(https://analysis.apache.org/dashboard/index/org.apache.deltaspike:deltaspike-project)
+
+
+=== First Commit (22.12.2011)
+
+The infra team created our GIT repository and we made the first commit.
+
+
+=== First JIRA ticket (13.12.2011)
+
+
+We created our JIRA project and filed the first ticket.
+
+
+=== First report 12.2011 (12.12.2011)
+
+We submitted the first report to
+http://wiki.apache.org/incubator/December2011
+
+
+=== Twitter Account
+
+
+We created our Twitter account https://twitter.com/deltaspiketeam[@DeltaSpikeTeam]
+
+
+=== Mailing-lists (8.12.2011)
+
+Matt Benson created our https://s.apache.org/Kpg[mailing-lists].
+
+
+=== Vote closed (7.12.2011)
+
+
+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.
+
+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
+
+Our mentors are:
+
+* David Blevins
+* Gerhard Petracek
+* Jim Jagielski
+* Mark Struberg
+* Matt Benson
+* Matthias Wessendorf
+
+
+=== Vote to join the Incubator (4.12.2011)
+
+
+Gerhard Petracek started the official http://s.apache.org/h8[vote].
+
+
+=== Proposal (30.11.2011)
+
+
+After some discussions between the teams (of Apache MyFaces CODI, Seam3 and CDISource), Mark Struberg submitted the
+http://wiki.apache.org/incubator/DeltaSpikeProposal[proposal]. Since Spike couldn't be used as project-name, we agreed on DeltaSpike as initial code name (delta because it closes several gaps).

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/release-preparation.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/release-preparation.adoc b/site/src/main/asciidoc/release-preparation.adoc
new file mode 100644
index 0000000..5c391c8
--- /dev/null
+++ b/site/src/main/asciidoc/release-preparation.adoc
@@ -0,0 +1,28 @@
+= Reviewing an Apache Release
+
+:Notice: 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.
+
+[TOC]
+
+
+== Introduction
+
+
+Once a Release has been staged on http://repository.apache.org it must
+be reviewed by each PMC member *before* casting his VOTE.
+
+The following points need to be checked:
+
+* is the GPG signature fine?
+* is there a source archive?
+* can the source archive really be built?
+* is there a correct LICENSE and NOTICE file in each artifact (both
+source and binary artifacts)?
+* does the NOTICE file contain all necessary attributions?
+* 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
+* do all the tests work?
+* if there is a TCK to run, does it succeed?
+* if there is a tag in the SCM, does it contain reproduceable sources?
+

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/steps_for_a_release.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/steps_for_a_release.adoc b/site/src/main/asciidoc/steps_for_a_release.adoc
new file mode 100644
index 0000000..d9d91dc
--- /dev/null
+++ b/site/src/main/asciidoc/steps_for_a_release.adoc
@@ -0,0 +1,222 @@
+= Steps for a Release
+
+:Notice: 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.
+
+[TOC]
+
+== Preparations
+
+ - Heads up on the mailing-lists
+
+e.g.:
+
+-----------------------------------------------------------------------------------------------------------------------
+first steps for the next release
+
+hi @ all,
+
+if there are no objections, i'll start with the first steps for the next release (review, documentation,...).
+it would be great to start with the release procedure next week.
+
+regards,
+[name]
+-----------------------------------------------------------------------------------------------------------------------
+
+ - Check the documentation
+ - Check https://analysis.apache.org/dashboard/index/87921
+ - Check diff with tag of [version-1]
+ - Check the jenkins builds
+ - Create release notes and commit them to deltaspike/readme/ (format [ReleaseNotes][version].txt)
+
+
+test at least:
+
+-----------------------------------------------------------------------------------------------------------------------
+mvn clean install -POWB
+mvn clean install -PWeld
+mvn clean install -Prat
+mvn clean install -Ptomee-build-managed
+mvn clean install -Pjbossas-build-managed-7
+mvn clean install -Pwildfly-build-managed
+mvn clean install -Pglassfish-build-managed-3
+-----------------------------------------------------------------------------------------------------------------------
+
+deploy a demo app esp. with jsf-impl-ee6 to an ee6 server and check the logs (if there are no optional ee7+ classes)
+(https://github.com/os890/ee6-ds-demo can be used for it e.g.)
+
+== First steps
+
+-----------------------------------------------------------------------------------------------------------------------
+//install a version of git which is compatible with the release-plugin (e.g. v1.8.3.2)
+git checkout -b deltaspike-[release version]
+
+mvn release:prepare -Pdistribution -DreleaseProfiles=distribution
+
+//hint: don't use -DdryRun=true -- since it can break the next step
+mvn release:perform -Pdistribution -DreleaseProfiles=distribution
+
+//!!!check the created commits including user-name and email
+
+//login to https://repository.apache.org/ and go to "Staging Repositories"
+//check esp. .../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+//close the repository
+
+//push the release-branch and tag to a 3rd party git repo
+git remote add vote https://github.com/[user]/deltaspike-vote
+git push -u vote master
+git push vote deltaspike-[release version]
+git push vote --tags
+-----------------------------------------------------------------------------------------------------------------------
+
+== Vote
+
+=== Start the vote
+
+e.g.:
+
+
+-----------------------------------------------------------------------------------------------------------------------
+[VOTE] Release of Apache DeltaSpike [version]
+
+
+Hi,
+
+I was running the needed tasks to get the ... release of Apache DeltaSpike out.
+The artifacts are deployed to Nexus [1] (and [2]).
+
+The tag is available at [3] and will get pushed to the ASF repository once the vote passed.
+
+Please take a look at the ... artifacts and vote!
+
+Please note:
+This vote is "majority approval" with a minimum of three +1 votes (see [4]).
+
+------------------------------------------------
+[ ] +1 for community members who have reviewed the bits
+[ ] +0
+[ ] -1 for fatal flaws that should cause these bits not to be released, and why..............
+------------------------------------------------
+
+Thanks,
+[name]
+
+[1] https://repository.apache.org/content/repositories/...
+[2] https://repository.apache.org/content/repositories/.../org/apache/deltaspike/deltaspike-project/[version]/deltaspike-project-[version]-source-release.zip
+[3] https://github.com/[user]/deltaspike-vote/tree/deltaspike-project-[version]
+[4] http://www.apache.org/foundation/voting.html#ReleaseVotes
+-----------------------------------------------------------------------------------------------------------------------
+
+== Announce the vote
+
+ - Create a link to the release notes at http://s.apache.org (format DeltaSpike_[version])
+ - Tweet about the vote via @DeltaSpikeTeam.
+
+== Perform the final release
+
+=== Close the vote
+
+After 72 hours close the vote.
+
+e.g.:
+
+
+-----------------------------------------------------------------------------------------------------------------------
+Result (was: Re: [VOTE] Release of Apache DeltaSpike [version])
+
+thank you for voting!
+
+X binding +1 votes (pmc):
+[list]
+
+Y non-binding +1 votes:
+[list]
+
+Z -1 votes
+[list]
+-----------------------------------------------------------------------------------------------------------------------
+
+
+If the binding majority approved the vote continue.
+
+ - Login to https://repository.apache.org/ and release the repository
+ - Merge release branch into master and push the branch and tag to the ASF repository
+
+
+Always do a merge in this case (not a rebase):
+
+
+-----------------------------------------------------------------------------------------------------------------------
+git checkout master
+git merge deltaspike-[version]
+git push origin deltaspike-[version]
+git push origin deltaspike-project-[version]
+git push origin master
+-----------------------------------------------------------------------------------------------------------------------
+
+
+ - Create the release at jira
+ - Close the corresponding tickets of the version
+ - Wait some hours and check http://repo2.maven.org/maven2/org/apache/deltaspike
+
+
+
+=== Upload artifacts
+
+-----------------------------------------------------------------------------------------------------------------------
+svn co https://dist.apache.org/repos/dist/release/deltaspike
+mkdir [version]
+//add and commit the artifacts (at least *source-release.zip + asc, md5, sha1)
+-----------------------------------------------------------------------------------------------------------------------
+
+=== Check downloads
+
+ - http://www.eu.apache.org/dist/deltaspike
+ - http://www.us.apache.org/dist/deltaspike
+
+=== Update site content
+
+via CMS:
+
+ - Update download links: http://deltaspike.apache.org/download.html
+ - Update news: http://deltaspike.apache.org/news.html
+ - Update version: http://deltaspike.apache.org/index.html
+
+=== Announce the Release
+
+==== E-Mails
+
+
+-----------------------------------------------------------------------------------------------------------------------
+[ANNOUNCE] Release of Apache DeltaSpike [version]
+
+The Apache DeltaSpike team is pleased to announce the 6th release of DeltaSpike.
+
+Apache DeltaSpike is not a CDI-container, but a portable CDI extension.
+
+Documentation:
+http://deltaspike.apache.org/documentation.html
+
+Download:
+http://deltaspike.apache.org/download.html
+
+Release Notes:
+http://s.apache.org/DeltaSpike_06
+
+Enjoy!
+
+[name]
+-----------------------------------------------------------------------------------------------------------------------
+
+Write the e-mails to:
+
+ - announce@apache.org
+ - dev@deltaspike.apache.org
+ - users@deltaspike.apache.org
+
+==== Twitter
+
+e.g.:
+
+-----------------------------------------------------------------------------------------------------------------------
+[ANNOUNCE] The Apache #DeltaSpike team is pleased to announce http://s.apache.org/DeltaSpike_[version]. Feel free to test it! Feedback is very welcome!
+-----------------------------------------------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/site/src/main/asciidoc/suggested-git-workflows.adoc
----------------------------------------------------------------------
diff --git a/site/src/main/asciidoc/suggested-git-workflows.adoc b/site/src/main/asciidoc/suggested-git-workflows.adoc
new file mode 100644
index 0000000..da8785f
--- /dev/null
+++ b/site/src/main/asciidoc/suggested-git-workflows.adoc
@@ -0,0 +1,218 @@
+= Suggested GIT workflows
+
+:Notice: 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.
+
+[TOC]
+
+
+== Avoid git-pull!
+
+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:
+
+----------------------------------------------------------------------------
+Merge branch 'master' of http://git-wip-us.apache.org/deltaspike into master
+----------------------------------------------------------------------------
+
+
+== git pull --rebase
+
+
+An easy version for getting rid of the auto-merges is using
+
+[source,bash]
+--------------------
+$ git pull --rebase
+--------------------
+
+Please note that this sometimes trashes your working tree if there are
+unmergeable files around. Cleaning this up with a forced manual rebase
+is not something we would recommend for a git beginner.
+
+
+=== Working in an own branch
+
+
+This is actually the suggested way to prevent auto-merges.
+
+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.
+
+[source,bash]
+----------------------
+$ git branch mybranch
+----------------------
+
+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.
+
+Then switch back to the master branch and pull changes done by other
+committers in the meantime.
+
+----------------------
+$ git checkout master
+$ git pull --rebase
+----------------------
+
+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.
+
+------------------------
+$ git checkout mybranch
+$ git rebase master
+------------------------
+
+If you got conflicts, you will get lines with ">>>>" added to those
+files. Resolve those conflicts manually, add them and finish the rebase.
+
+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.
+
+------------------------------------------------------------------------
+$ git pull --rebase     // (just for safety, you should see no changes)
+$ git checkout master
+$ git merge mybranch
+------------------------------------------------------------------------
+
+Finally you can push your changes to the ASF git repo
+
+-----------
+$ git push
+-----------
+
+
+== Contribution workflow
+
+
+=== Creating patches
+
+
+You should use the following workflow, if you plan to contribute patches or new features to DeltaSpike.
+
+First update you local copy of the repository:
+
+----------------------
+$ git checkout master
+$ git pull --rebase
+----------------------
+
+Then create a new local branch for your work. It's good practice to name it after the corresponding JIRA issue.
+
+---------------------------------
+$ git checkout -b DELTASPIKE-XXX
+---------------------------------
+
+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**.
+
+-------------------------------------------------
+$ git add -am "DELTASPIKE-XXX: Fixed some issue"
+-------------------------------------------------
+
+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.
+
+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.
+
+[source,bash]
+------------------------------
+$ git checkout master
+$ git pull --rebase
+$ git checkout DELTASPIKE-XXX
+$ git rebase master
+------------------------------
+
+Now you are ready to create your patch:
+
+[source,bash]
+--------------------------------------------------------------
+$ git checkout DELTASPIKE-XXX
+$ git format-patch --stdout master > ../DELTASPIKE-XXX.patch 
+--------------------------------------------------------------
+
+Please attach the resulting patch file to the correspoding JIRA issue.
+
+===Applying patches
+
+
+If you are a committer and want to apply a patch you should do so in a
+separate branch.
+
+---------------------------------
+$ git checkout -b DELTASPIKE-XXX
+---------------------------------
+
+Then apply the patch using `git-am` and rebase it against the master
+branch.
+
+------------------------------------
+$ git am < ../DELTASPIKE-XXX.patch 
+$ git rebase master
+------------------------------------
+
+After reviewing the changes and testing the code, the changes are ready
+to be merged into the master branch:
+
+-------------------------------
+$ git checkout master
+$ git merge DELTASPIKE-XXX
+$ git branch -d DELTASPIKE-XXX
+-------------------------------
+
+
+== Discussion workflow (optional)
+
+
+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 _NEVER_ get pushed to the main Apache repository to keep the
+commit history as clean as possible.
+
+*Initial setup*
+
+[source,bash]
+----------------------------------------------------------------------------------
+$ git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git ./
+$ git remote add discuss https://[username]@github.com/[username]/[repo-name].git
+$ git push -u discuss master
+----------------------------------------------------------------------------------
+
+*Branches for discussions*
+
+[source,bash]
+--------------------------------------------------
+$ git checkout -b DELTASPIKE-XXX
+//1-n commits
+$ git push discuss DELTASPIKE-XXX
+//share the link to the branch for the discussions
+--------------------------------------------------
+
+_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._
+
+*Delete the branch again*
+
+----------------------------------
+$ git push discuss :DELTASPIKE-XXX
+$ git branch -d DELTASPIKE-XXX
+----------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2ed422f1/template/document.html.erb
----------------------------------------------------------------------
diff --git a/template/document.html.erb b/template/document.html.erb
new file mode 100644
index 0000000..0ad3057
--- /dev/null
+++ b/template/document.html.erb
@@ -0,0 +1,100 @@
+<%#encoding:UTF-8%><!DOCTYPE html>
+<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><%= document.name %></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. -->
+
+<!-- Styles -->
+
+<link href="https://deltaspike.apache.org/resources/css/bootstrap.css" rel="stylesheet">
+<link href="https://deltaspike.apache.org/resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+<style type="text/css">
+<%= ::Asciidoctor::Stylesheets.instance.coderay_stylesheet_data %>
+body {
+	padding-top: 60px;
+	padding-bottom: 40px;
+}
+</style>
+<script type="text/javascript">
+
+	  var _gaq = _gaq || [];
+	  _gaq.push(['_setAccount', 'UA-36103647-1']);
+	  _gaq.push(['_trackPageview']);
+	
+	  (function() {
+		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+	  })();
+	
+	</script>
+</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 logocolor"
+					href="http://deltaspike.apache.org/index.html">Apache DeltaSpike []</a>
+				<div class="nav-collapse">
+					<ul class="nav">
+						<li class="active"><a
+							href="index.html">Home</a></li>
+						<li><a href="<%= (attr :basedir) %>/documentation">Documentation</a></li>
+						<li><a href="<%= (attr :basedir) %>/javadoc.html">Javadoc</a></li>
+						<li><a href="<%= (attr :basedir) %>/documentation/source.html">Source</a></li>
+						<li><a href="<%= (attr :basedir) %>/download.html">Download</a></li>
+						<li><a href="<%= (attr :basedir) %>/community.html">Community</a></li>
+						<!-- <li><a href="./support.html">Support</a></li>  -->
+						<li><a href="<%= (attr :basedir) %>/news.html">News</a></li>
+						<li><a href="<%= (attr :basedir) %>/migration-guide.html">Migration</a></li>
+					</ul>
+				</div>
+				<!--/.nav-collapse -->
+				<form id="search-form" action="http://www.google.com/search"
+					method="get" class="navbar-search pull-right">
+					<input value="deltaspike.apache.org" name="sitesearch"
+						type="hidden"> <input class="search-query" name="q"
+						id="query" type="text">
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<div class="container">
+		<div class="row">
+			<div class="span12">
+				<div class="page-title">
+			    <h1><%= document.name %></h1>
+                </div>
+
+				<div id="toc" class="<%= attr 'toc-class', 'toc' %>">
+       	 		<%= converter.convert_with_options @document, 'outline', :toclevels => 4  %>
+       	 		<hr>	
+       	 		
+				<%= document.content %>
+			</div>
+
+			<hr>
+
+			<footer>
+				<p>Copyright © 2011-2014 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 -->
+
+</body>
+</html>


Mime
View raw message