deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r932468 [2/2] - in /websites/staging/deltaspike/trunk/content: ./ retired/ staging/
Date Fri, 12 Dec 2014 17:46:00 GMT
Added: websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html (added)
+++ websites/staging/deltaspike/trunk/content/retired/suggested-git-workflows.html Fri Dec
12 17:45:59 2014
@@ -0,0 +1,259 @@
+<!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 - </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="./../resources/css/bootstrap.css" rel="stylesheet">    
+    <!--<link href="./../resources/css/prettify.css" rel="stylesheet" /> -->
+    <link href="./../resources/css/codehilite.css" rel="stylesheet" />
+    <link href="./../resources/css/bootstrap-responsive.css" rel="stylesheet">
+
+    <style type="text/css">
+        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="/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="./../documentation/">Documentation</a></li>
+                        <li><a href="./../javadoc.html">Javadoc</a></li>
+                        <li><a href="./../documentation/source.html">Source</a></li>
+                        <li><a href="./../download.html">Download</a></li>
+                        <li><a href="./../community.html">Community</a></li>
+                        <!-- <li><a href="./../support.html">Support</a></li>
 -->
+                        <li><a href="./../news.html">News</a></li>
+                        <li><a href="./../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></h1>
+              </div>
+              <div class="toc">
+<ul>
+<li><a href="#suggested-git-workflows">Suggested GIT workflows</a><ul>
+<li><a href="#avoid-git-pull">Avoid git-pull!</a></li>
+<li><a href="#git-pull-rebase">git pull --rebase</a><ul>
+<li><a href="#working-in-an-own-branch">Working in an own branch</a></li>
+</ul>
+</li>
+<li><a href="#contribution-workflow">Contribution workflow</a><ul>
+<li><a href="#creating-patches">Creating patches</a></li>
+<li><a href="#applying-patches">Applying patches</a></li>
+</ul>
+</li>
+<li><a href="#discussion-workflow-optional">Discussion workflow (optional)</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="suggested-git-workflows">Suggested GIT workflows</h1>
+<h2 id="avoid-git-pull">Avoid git-pull!</h2>
+<p>git-pull should never get invoked if you have dirty files lying around or if your
branch is ahead of master.
+This will always lead to some dirty artifacts in the commit history:</p>
+<div class="codehilite"><pre><span class="n">Merge</span> <span
class="n">branch</span> <span class="s">&#39;master&#39;</span>
<span class="n">of</span> <span class="n">http</span><span class="p">:</span><span
class="o">//</span><span class="n">git</span><span class="o">-</span><span
class="n">wip</span><span class="o">-</span><span class="n">us</span><span
class="p">.</span><span class="n">apache</span><span class="p">.</span><span
class="n">org</span><span class="o">/</span><span class="n">deltaspike</span>
<span class="n">into</span> <span class="n">master</span>
+</pre></div>
+
+
+<h2 id="git-pull-rebase">git pull --rebase</h2>
+<p>An easy version for getting rid of the auto-merges is using </p>
+<div class="codehilite"><pre><span class="c">%&gt; git pull --rebase</span>
+</pre></div>
+
+
+<p>Please 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.</p>
+<h3 id="working-in-an-own-branch">Working in an own branch</h3>
+<p>This is actually the suggested way to prevent auto-merges.</p>
+<p>Create an own branch where you do your feature work. Either do all your work in
one branch or create one branch per feature you are working on.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git branch mybranch</span>
+</pre></div>
+
+
+<p>After you finished your feature, <code>git-add</code> and <code>git-commit</code>
your work. Check with <code>git-status</code> that you don't have any dirty files
and uncommitted changes around. You can use <code>git-stash</code> to 'backup'
unfinished work.</p>
+<p>Then switch back to the master branch and pull changes done by other committers
in the meantime.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git pull --rebase</span>
+</pre></div>
+
+
+<p>You should now get all the changes done by other committers and the will get applied
to your local master branch.
+Now go back to your private branch and rebase your locally performed work to the HEAD of
master.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout mybranch</span>
+<span class="c">%&gt; git rebase master</span>
+</pre></div>
+
+
+<p>If you got conflicts, you will get lines with "&gt;&gt;&gt;&gt;"
added to those files. Resolve those conflicts manually, add them and finish the rebase.</p>
+<p>Check with <code>git-status</code> and <code>gitk</code>
if the merge went well and the history now contains your changes.
+If all is well, go back to the master branch and merge your changes in.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git pull --rebase
    // (just for safety, you should see no changes)</span>
+<span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git merge mybranch</span>
+</pre></div>
+
+
+<p>Finally you can push your changes to the ASF git repo</p>
+<div class="codehilite"><pre><span class="c">%&gt; git push</span>
+</pre></div>
+
+
+<h2 id="contribution-workflow">Contribution workflow</h2>
+<h3 id="creating-patches">Creating patches</h3>
+<p>You should use the following workflow, if you plan to contribute patches or new
features to DeltaSpike.</p>
+<p>First update you local copy of the repository:</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git pull --rebase</span>
+</pre></div>
+
+
+<p>Then create a new local branch for your work. It's good practice to name it after
the corresponding JIRA issue.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout -b
DELTASPIKE-XXX</span>
+</pre></div>
+
+
+<p>Now you can start to work on your patch. When you are finished, commit your changes.
But don't forget to <strong>add the name of the JIRA issue to the commit message</strong>.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git add -am &quot;DELTASPIKE-XXX:
Fixed some issue&quot;</span>
+</pre></div>
+
+
+<p>For small patches we recommend to do a single commit containing your changes. For
larger contributions you should try to group your work into separate sub-tasks that you can
commit one by one.</p>
+<p>Before you create your patch you should make sure that your local repository is
up to date with the master repository. This is very important especially if you work on your
branch for a long time. Use the following commands to pull the latest changes from the upstream
repository and rebase your branch against the current master.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git pull --rebase</span>
+<span class="c">%&gt; git checkout DELTASPIKE-XXX</span>
+<span class="c">%&gt; git rebase master</span>
+</pre></div>
+
+
+<p>Now you are ready to create your patch:</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout DELTASPIKE-XXX</span>
+<span class="c">%&gt; git format-patch --stdout master &gt; ../DELTASPIKE-XXX.patch</span>
+</pre></div>
+
+
+<p>Please attach the resulting patch file to the correspoding JIRA issue.</p>
+<h3 id="applying-patches">Applying patches</h3>
+<p>If you are a committer and want to apply a patch you should do so in a separate
branch.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout -b
DELTASPIKE-XXX</span>
+</pre></div>
+
+
+<p>Then apply the patch using <code>git-am</code> and rebase it against
the master branch.</p>
+<div class="codehilite"><pre><span class="c">%&gt; git am &lt;
../DELTASPIKE-XXX.patch </span>
+<span class="c">%&gt; git rebase master</span>
+</pre></div>
+
+
+<p>After reviewing the changes and testing the code, the changes are ready to be merged
into the master branch:</p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout master</span>
+<span class="c">%&gt; git merge DELTASPIKE-XXX</span>
+<span class="c">%&gt; git branch -d DELTASPIKE-XXX</span>
+</pre></div>
+
+
+<h2 id="discussion-workflow-optional">Discussion workflow (optional)</h2>
+<p>All discussions which lead to a decision take place on the mailing list. Sometimes
it's required to show-case an idea esp. if the solution is more than few lines. As shown above
it makes sense to use local branches for developing new parts. Git allows to push such local
branches to a public repository. So it's easier to share it with the community for discussing
it. The following listings show an example in combination with GitHub - for sure it works
with any hosting platform like BitBucket, Google-Code,... The only important part here is
that such branches <em>NEVER</em> get pushed to the main Apache repository to
keep the commit history as clean as possible.</p>
+<p><strong>Initial setup</strong></p>
+<div class="codehilite"><pre><span class="c">%&gt; git clone https://git-wip-us.apache.org/repos/asf/deltaspike.git
./</span>
+<span class="c">%&gt; git remote add discuss https://[username]@github.com/[username]/[repo-name].git</span>
+<span class="c">%&gt; git push -u discuss master</span>
+</pre></div>
+
+
+<p><strong>Branches for discussions</strong></p>
+<div class="codehilite"><pre><span class="c">%&gt; git checkout -b
DELTASPIKE-XXX</span>
+<span class="o">//</span>1<span class="o">-</span><span class="n">n</span>
<span class="n">commits</span>
+<span class="c">%&gt; git push discuss DELTASPIKE-XXX</span>
+<span class="o">//</span><span class="n">share</span> <span class="n">the</span>
<span class="n">link</span> <span class="n">to</span> <span class="n">the</span>
<span class="n">branch</span> <span class="k">for</span> <span
class="n">the</span> <span class="n">discussions</span>
+</pre></div>
+
+
+<p><em>If the community agrees on the suggested change, the implementation will
be applied to the origin master. A committer has to follow the steps described above for the
basic workflow to keep the commit history simple, clean and straight. A contributor has to
follow the steps described above for creating a patch.</em></p>
+<p><strong>Delete the branch again</strong></p>
+<div class="codehilite"><pre><span class="c">%&gt;git push discuss
:DELTASPIKE-XXX</span>
+<span class="c">%&gt;git branch -d DELTASPIKE-XXX</span>
+</pre></div>
+          </div>
+      </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 -->
+
+    <!-- Javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <!--<script src="./../resources/js/prettyfy.js"></script> -->
+    <script src="./../resources/js/prettyprint.js"></script>
+    <script src="./../resources/js/jquery.js"></script>
+    <script src="./../resources/js/bootstrap-transition.js"></script>
+    <script src="./../resources/js/bootstrap-alert.js"></script>
+    <script src="./../resources/js/bootstrap-modal.js"></script>
+    <script src="./../resources/js/bootstrap-dropdown.js"></script>
+    <script src="./../resources/js/bootstrap-scrollspy.js"></script>
+    <script src="./../resources/js/bootstrap-tab.js"></script>
+    <script src="./../resources/js/bootstrap-tooltip.js"></script>
+    <script src="./../resources/js/bootstrap-popover.js"></script>
+    <script src="./../resources/js/bootstrap-button.js"></script>
+    <script src="./../resources/js/bootstrap-collapse.js"></script>
+    <script src="./../resources/js/bootstrap-carousel.js"></script>
+    <script src="./../resources/js/bootstrap-typeahead.js"></script>
+</body>
+</html>

Added: websites/staging/deltaspike/trunk/content/staging/contributors.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/contributors.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/contributors.html Fri Dec 12 17:45:59
2014
@@ -0,0 +1,28 @@
+{% extends "deltaspike-markdown.html" %}
+
+
+{% block title %}Apache DeltaSpike{% endblock %}
+{% block content %}
+
+<ul class="contributors">
+{% for contributor in contributors %}
+    <li>
+        <div class="photo">
+            <a href="{{ contributor.gravatarHome }}">
+                <img src="http://gravatar.com/avatar/{{ contributor.gravatarImage }}?s=140"/>
+            </a>
+            <ul>
+                <li><a href="{{ contributor.site }}">Blog</a></li>
+                <li><a href="{{ contributor.twitter }}">Twitter</a></li>
+                <li><a href="{{ contributor.github }}">GitHub</a></li>
+            </ul>
+        </div>
+        <h3>{{ contributor.name }}</h3>
+        {{ contributor.info }}
+    </li>
+{% endfor %}
+</ul>
+
+<div align="center">All information below are provided by Gravatar</div>
+
+{% endblock %}

Added: websites/staging/deltaspike/trunk/content/staging/index.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/staging/index.html (added)
+++ websites/staging/deltaspike/trunk/content/staging/index.html Fri Dec 12 17:45:59 2014
@@ -0,0 +1,43 @@
+{% extends "deltaspike-markdown.html" %}
+
+
+{% block title %}Apache DeltaSpike{% endblock %}
+{% block content %}
+
+        <div class="row valign-wrapper">
+            <div class="span6 padded"><img src="resources/images/logos/logo.png"/></div>
+            <div class="span6 padded">
+                <h2>About Apache DeltaSpike</h2>
+                <p>DeltaSpike consists of a number of portable CDI extensions that
provide useful features for Java application developers.</p>
+                <p>We will also ensure true portability! We are testing DeltaSpike
on different CDI implementations like Apache OpenWebBeans and
+                    JBoss Weld, and also on different Java EE servers like Apache Tomcat
and TomEE, JBoss AS7, WildFly 8.x,
+                    Oracle GlassFish 3.1+ and 4.x+, IBM WebSphere 8.x, Oracle WebLogic Server
12c, Jetty, and others.</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="span6">
+                <h2>Latest Award</h2>
+                <p>In 2014, DeltaSpike become a Duke’s Choice Award winner. The
Duke's Choice Awards celebrate extreme 
+                       innovation in the world of Java technology and are granted to the
most innovative projects using the Java platform.</p>
+                <p><img src="resources/images/DukeChoice-100x176.png"/></p>
+            </div>
+            <div class="span6">
+                <h2>News</h2>
+                <p>Apache DeltaSpike 1.2.0 is now out!</p>
+                <p><a class="btn" href="/news.html#13th-release-120-30112014">View
details »</a></p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="span6">
+                <h2>Modules</h2>
+                <p>CDI extensions created by the Apache DeltaSpike community are packaged
as modules. They offer additional functionality not provided out of the box by the CDI spec
(Security, JPA, ...) </p>
+                <p><a class="btn" href="documentation/#_module_overview">View
details »</a></p>
+            </div>
+            <div class="span6">
+                <h2>Examples</h2>
+                <p>See the following examples which are part of the project to discover
how to use DeltaSpike project.</p>
+                <p><a class="btn" href="examples.html">View details »</a></p>
+            </div>
+        </div>
+
+{% endblock %}
\ No newline at end of file



Mime
View raw message