Author: schor Date: Thu Sep 5 19:56:08 2019 New Revision: 1866489 URL: http://svn.apache.org/viewvc?rev=1866489&view=rev Log: no jira, start some git pages - conventions, how to convert, a top level nav page
Added: uima/site/trunk/uima-website/docs/convert-to-git.html uima/site/trunk/uima-website/docs/git-conventions.html uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/xdocs/convert-to-git.xml uima/site/trunk/uima-website/xdocs/git-conventions.xml uima/site/trunk/uima-website/xdocs/git.xml Modified: uima/site/trunk/uima-website/docs/annotators.html uima/site/trunk/uima-website/docs/apache-board-status.html uima/site/trunk/uima-website/docs/building-uima.html uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html uima/site/trunk/uima-website/docs/checklist-release.html uima/site/trunk/uima-website/docs/code-scan-tools.html uima/site/trunk/uima-website/docs/codeConventions.html uima/site/trunk/uima-website/docs/coling14.html uima/site/trunk/uima-website/docs/communication.html uima/site/trunk/uima-website/docs/contribution-policy.html uima/site/trunk/uima-website/docs/decisions.html uima/site/trunk/uima-website/docs/dependencies.html uima/site/trunk/uima-website/docs/dev-docbook.html uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html uima/site/trunk/uima-website/docs/dev-quick.html uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html uima/site/trunk/uima-website/docs/distribution.html uima/site/trunk/uima-website/docs/doc-uima-annotator.html uima/site/trunk/uima-website/docs/doc-uima-examples.html uima/site/trunk/uima-website/docs/doc-uima-pears.html uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html uima/site/trunk/uima-website/docs/doc-uima-why.html uima/site/trunk/uima-website/docs/doc-uimaas-what.html uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html uima/site/trunk/uima-website/docs/documentation.html uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/docs/eclipse-update-archives.html uima/site/trunk/uima-website/docs/eclipse-update-site.html uima/site/trunk/uima-website/docs/external-resources.html uima/site/trunk/uima-website/docs/faq.html uima/site/trunk/uima-website/docs/get-involved.html uima/site/trunk/uima-website/docs/gldv07.html uima/site/trunk/uima-website/docs/gscl09.html uima/site/trunk/uima-website/docs/gscl13.html uima/site/trunk/uima-website/docs/iks09.html uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/docs/license.html uima/site/trunk/uima-website/docs/lrec08.html uima/site/trunk/uima-website/docs/lsm09.html uima/site/trunk/uima-website/docs/mail-lists.html uima/site/trunk/uima-website/docs/management.html uima/site/trunk/uima-website/docs/maven-design.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/docs/one-time-release-setup.html uima/site/trunk/uima-website/docs/one-time-setup.html uima/site/trunk/uima-website/docs/privacy-policy.html uima/site/trunk/uima-website/docs/project-guidelines.html uima/site/trunk/uima-website/docs/publications.html uima/site/trunk/uima-website/docs/release-before-2.3.1.html uima/site/trunk/uima-website/docs/release.html uima/site/trunk/uima-website/docs/roles.html uima/site/trunk/uima-website/docs/ruta.html uima/site/trunk/uima-website/docs/sandbox.html uima/site/trunk/uima-website/docs/saving-svn-resources.html uima/site/trunk/uima-website/docs/security_report.html uima/site/trunk/uima-website/docs/svn.html uima/site/trunk/uima-website/docs/team-list.html uima/site/trunk/uima-website/docs/testing-builds.html uima/site/trunk/uima-website/docs/toolsServers.html uima/site/trunk/uima-website/docs/uima-specification.html uima/site/trunk/uima-website/docs/uimafit.html uima/site/trunk/uima-website/docs/updating-website.html uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Modified: uima/site/trunk/uima-website/docs/annotators.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/annotators.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/annotators.html (original) +++ uima/site/trunk/uima-website/docs/annotators.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/apache-board-status.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/apache-board-status.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/apache-board-status.html (original) +++ uima/site/trunk/uima-website/docs/apache-board-status.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/building-uima.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/building-uima.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/building-uima.html (original) +++ uima/site/trunk/uima-website/docs/building-uima.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html (original) +++ uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/checklist-release.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/checklist-release.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/checklist-release.html (original) +++ uima/site/trunk/uima-website/docs/checklist-release.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/code-scan-tools.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/code-scan-tools.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/code-scan-tools.html (original) +++ uima/site/trunk/uima-website/docs/code-scan-tools.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/codeConventions.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/codeConventions.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/codeConventions.html (original) +++ uima/site/trunk/uima-website/docs/codeConventions.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/coling14.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/coling14.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/coling14.html (original) +++ uima/site/trunk/uima-website/docs/coling14.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/communication.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/communication.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/communication.html (original) +++ uima/site/trunk/uima-website/docs/communication.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/contribution-policy.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/contribution-policy.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/contribution-policy.html (original) +++ uima/site/trunk/uima-website/docs/contribution-policy.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Added: uima/site/trunk/uima-website/docs/convert-to-git.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/convert-to-git.html?rev=1866489&view=auto ============================================================================== --- uima/site/trunk/uima-website/docs/convert-to-git.html (added) +++ uima/site/trunk/uima-website/docs/convert-to-git.html Thu Sep 5 19:56:08 2019 @@ -0,0 +1,269 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd"> + + + <!-- ====================================================================== --> + <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! --> + <!-- ====================================================================== --> + <html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <style type="text/css">@import "stylesheets/base.css";</style> + <meta name="author" value=" Apache UIMA Documentation Team"> + <meta name="email" value="d...@uima.apache.org"> + + + + <title>Apache UIMA - Converting project to GIT</title> + + <!-- Begin Cookie Consent plugin by Silktide - https://silktide.com/cookieconsent --> + <!-- Commented out because implied consent is not compatible with GDPR --> + <!-- + <script type="text/javascript"> + window.cookieconsent_options = {"message":"This website uses cookies to ensure you get the best experience on our website","dismiss":"Got it!","learnMore":"More info","link":"https://uima.apache.org/privacy-policy.html","theme":"dark-bottom"}; + </script> + + <script type="text/javascript" src="/cookieconsent2/cookieconsent.min.js"></script> + --> + <!-- End Cookie Consent plugin --> + + <!-- Begin Google Analytics --> + <!-- Commented out because GA requires consent according to GDPR --> + <!-- + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-70846351-1', 'auto'); + ga('set', 'anonymizeIp', true); + ga('send', 'pageview'); + + </script> + --> + <!-- End Google Analytics --> + </head> + + <body> + <div class="topLogos"> + <table border="0" width="100%" cellspacing="0"> + <!-- TOP IMAGE --> + <tr> + <td align='LEFT'> + <a href="index.html"> + <img style="border: 1px solid black;" src="./images/UIMA_banner2tlpTm.png" alt="UIMA project logo" border="0"/> + </a> + </td> + <td align='CENTER'> + <div class="pageBanner">Converting project to GIT</div> + </td> + <td align='RIGHT'> + <a href="https://www.apache.org"> + <img src="./images/asf-logo-on-white-smallTm.png" alt="Apache UIMA" border="0"/> + </a> + </td> + </tr> + </table> + <hr noshade="" size="1"/> + </div> + <table border="0" width="100%" cellspacing="4"> + <tr> + <td align='RIGHT' colspan="2"> + <form method="get" action="https://www.google.com/search"> + Search the site + <input type="text" name="q" size="25" maxlength="255" value="" /> + <input type="hidden" name="sitesearch" value="https://uima.apache.org/" /> + <input name="Search" value="Search Site" type="submit"/> + </form> + </td> + </tr> + <tr> <!-- LEFT SIDE NAVIGATION --> + <td width="20%" valign="top"> + + + + + + + <!-- regular menu --> + <div class="navBar"> + <br/> + <div class="navBarItem"> <div class="navPartHeading">General</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./index.html">Home</a> + </div> + <div class="navBarItem"> <a href="./downloads.cgi">Downloads</a> + </div> + <div class="navBarItem"> <a href="./documentation.html">Documentation</a> + </div> + <div class="navBarItem"> <a href="./news.html">News</a> + </div> + <div class="navBarItem"> <a href="./publications.html">Publications</a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://issues.apache.org/jira/browse/uima" target="_blank" rel="noopener">Issue tracker <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/" target="_blank" rel="noopener">Wiki <img src="images/offsitelink.png"/></a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA" target="_blank" rel="noopener">Powered By UIMA <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Community</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./get-involved.html">Get Involved</a> + </div> + <div class="navBarItem"> <a href="./mail-lists.html">Mailing Lists</a> + </div> + <div class="navBarItem"> <a href="./contribution-policy.html">Contribution Policies</a> + </div> + <div class="navBarItem"> <a href="./faq.html">FAQ</a> + </div> + <div class="navBarItem"> <a href="./project-guidelines.html">Project Guidelines</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Scaleout Frameworks</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./doc-uimaas-what.html">UIMA-AS</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-whatitam.html">UIMA-DUCC</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-demo.html">..Demo Page</a> + </div> + <div class="navBarItem"> <a href="http://uima-ducc-demo.apache.org:42133" target="_blank" rel="noopener">..Demo Live <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Components & Tools</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./sandbox.html#uima-addons-annotators">Annotators</a> + </div> + <div class="navBarItem"> <a href="./toolsServers.html">Tools & Servers</a> + </div> + <div class="navBarItem"> <a href="./sandbox.html">Addons and Sandbox</a> + </div> + <div class="navBarItem"> <a href="./ruta.html">UIMA Ruta</a> + </div> + <div class="navBarItem"> <a href="./uimafit.html">uimaFIT</a> + </div> + <div class="navBarItem"> <a href="./external-resources.html">External Resources</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Development</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./dev-quick.html">Quick Start: building</a> + </div> + <div class="navBarItem"> <a href="./building-uima.html">Building from Source</a> + </div> + <div class="navBarItem"> <a href="./one-time-setup.html">One-time setups</a> + </div> + <div class="navBarItem"> <a href="./svn.html">Source Code</a> + </div> + <div class="navBarItem"> <a href="./distribution.html">Creating a Distribution</a> + </div> + <div class="navBarItem"> <a href="./release.html">Doing a UIMA release</a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/security/committers.html" target="_blank" rel="noopener">Doing a CVE (Apache) <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> + </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> + <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> + </div> + <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> + </div> + <div class="navBarItem"> <a href="./team-list.html">Project Team</a> + </div> + <div class="navBarItem"> <a href="./maven-design.html">Maven Use</a> + </div> + <div class="navBarItem"> <a href="./updating-website.html">Updating this Website</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Events and Conferences</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./coling14.html">COLING 2014</a> + </div> + <div class="navBarItem"> <a href="./gscl13.html">GSCL 2013</a> + </div> + <div class="navBarItem"> <a href="./iks09.html">IKS 2009</a> + </div> + <div class="navBarItem"> <a href="./gscl09.html">GSCL 2009</a> + </div> + <div class="navBarItem"> <a href="./lsm09.html">LSM 2009</a> + </div> + <div class="navBarItem"> <a href="./lrec08.html">LREC 2008</a> + </div> + <div class="navBarItem"> <a href="./gldv07.html">GLDV 2007</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">ASF</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="https://www.apache.org/licenses/" target="_blank" rel="noopener">License <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/thanks.html" target="_blank" rel="noopener">ASF Sponsors <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/sponsorship.html" target="_blank" rel="noopener">ASF Sponsorship <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./security_report">Security</a> + </div> + </div> + </div> + </td> + <td width="80%" align="left" valign="top"> + <div class="sectionTable"> + <table class="sectionTable"> + <tr><td> + <a name="Converting a project to GIT"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Converting a project to GIT</h1></a> + </td></tr> + <tr><td> + <blockquote class="sectionBody"> + <p>This describes the various steps needed in converting a project from SVN to GIT.</p> + <h3>Setup Read-only mirror, if not already done</h3> + <h3>File INFRA Jira ticket to convert read-only mirror to r/w</h3> + <h3>File INFRA Jira tickets for additional setup or fixups</h3> + <h4>Renaming Branches</h4> + <h3>Add .gitignore and .gitattributes</h3> + <p>These files should be added to the top (outer-most) containing folder for the projects in your repo. + They will be default apply to all subfolders. If you need to, you can override these settings in a subfolder.</p> + <p>Copy these files from some already converted repo.</p> + </blockquote> + </p> + </td></tr> + </table> + </td> + </tr> + <!-- FOOTER --> + <tr><td colspan="2"> + <hr noshade="" size="1"/> + </td></tr> + <tr><td colspan="2"> + <table class="pageFooter"> + <tr> + <td><a href="index.html">Home</a></td> + <td><a href="privacy-policy.html">Privacy Policy</a></td> + <td style="font-size:75%"> + Copyright © 2006-2013, The Apache Software Foundation.<br/> + Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/> + All other marks mentioned may be trademarks or registered trademarks of their respective owners. + </td> + <td><a href="mailto:d...@uima.apache.org">Contact us</a></td> + </tr> + </table> + </td></tr> + </table> + </body> + </html> + Modified: uima/site/trunk/uima-website/docs/decisions.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/decisions.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/decisions.html (original) +++ uima/site/trunk/uima-website/docs/decisions.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/dependencies.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dependencies.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/dependencies.html (original) +++ uima/site/trunk/uima-website/docs/dependencies.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/dev-docbook.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-docbook.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/dev-docbook.html (original) +++ uima/site/trunk/uima-website/docs/dev-docbook.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html (original) +++ uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html (original) +++ uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/dev-quick.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-quick.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/dev-quick.html (original) +++ uima/site/trunk/uima-website/docs/dev-quick.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html (original) +++ uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/distribution.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/distribution.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/distribution.html (original) +++ uima/site/trunk/uima-website/docs/distribution.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uima-annotator.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-annotator.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uima-annotator.html (original) +++ uima/site/trunk/uima-website/docs/doc-uima-annotator.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uima-examples.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-examples.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uima-examples.html (original) +++ uima/site/trunk/uima-website/docs/doc-uima-examples.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uima-pears.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-pears.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uima-pears.html (original) +++ uima/site/trunk/uima-website/docs/doc-uima-pears.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html (original) +++ uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uima-why.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-why.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uima-why.html (original) +++ uima/site/trunk/uima-website/docs/doc-uima-why.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uimaas-what.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaas-what.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uimaas-what.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaas-what.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html Thu Sep 5 19:56:08 2019 @@ -229,6 +229,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/documentation.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/documentation.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/documentation.html (original) +++ uima/site/trunk/uima-website/docs/documentation.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/eclipse-update-archives.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/eclipse-update-archives.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/eclipse-update-archives.html (original) +++ uima/site/trunk/uima-website/docs/eclipse-update-archives.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/eclipse-update-site.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/eclipse-update-site.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/eclipse-update-site.html (original) +++ uima/site/trunk/uima-website/docs/eclipse-update-site.html Thu Sep 5 19:56:08 2019 @@ -175,6 +175,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/external-resources.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/external-resources.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/external-resources.html (original) +++ uima/site/trunk/uima-website/docs/external-resources.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/faq.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/faq.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/faq.html (original) +++ uima/site/trunk/uima-website/docs/faq.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/get-involved.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/get-involved.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/get-involved.html (original) +++ uima/site/trunk/uima-website/docs/get-involved.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Added: uima/site/trunk/uima-website/docs/git-conventions.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-conventions.html?rev=1866489&view=auto ============================================================================== --- uima/site/trunk/uima-website/docs/git-conventions.html (added) +++ uima/site/trunk/uima-website/docs/git-conventions.html Thu Sep 5 19:56:08 2019 @@ -0,0 +1,276 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd"> + + + <!-- ====================================================================== --> + <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! --> + <!-- ====================================================================== --> + <html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <style type="text/css">@import "stylesheets/base.css";</style> + <meta name="author" value=" Apache UIMA Documentation Team"> + <meta name="email" value="d...@uima.apache.org"> + + + + <title>Apache UIMA - GIT Conventions for UIMA projects</title> + + <!-- Begin Cookie Consent plugin by Silktide - https://silktide.com/cookieconsent --> + <!-- Commented out because implied consent is not compatible with GDPR --> + <!-- + <script type="text/javascript"> + window.cookieconsent_options = {"message":"This website uses cookies to ensure you get the best experience on our website","dismiss":"Got it!","learnMore":"More info","link":"https://uima.apache.org/privacy-policy.html","theme":"dark-bottom"}; + </script> + + <script type="text/javascript" src="/cookieconsent2/cookieconsent.min.js"></script> + --> + <!-- End Cookie Consent plugin --> + + <!-- Begin Google Analytics --> + <!-- Commented out because GA requires consent according to GDPR --> + <!-- + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-70846351-1', 'auto'); + ga('set', 'anonymizeIp', true); + ga('send', 'pageview'); + + </script> + --> + <!-- End Google Analytics --> + </head> + + <body> + <div class="topLogos"> + <table border="0" width="100%" cellspacing="0"> + <!-- TOP IMAGE --> + <tr> + <td align='LEFT'> + <a href="index.html"> + <img style="border: 1px solid black;" src="./images/UIMA_banner2tlpTm.png" alt="UIMA project logo" border="0"/> + </a> + </td> + <td align='CENTER'> + <div class="pageBanner">GIT Conventions for UIMA projects</div> + </td> + <td align='RIGHT'> + <a href="https://www.apache.org"> + <img src="./images/asf-logo-on-white-smallTm.png" alt="Apache UIMA" border="0"/> + </a> + </td> + </tr> + </table> + <hr noshade="" size="1"/> + </div> + <table border="0" width="100%" cellspacing="4"> + <tr> + <td align='RIGHT' colspan="2"> + <form method="get" action="https://www.google.com/search"> + Search the site + <input type="text" name="q" size="25" maxlength="255" value="" /> + <input type="hidden" name="sitesearch" value="https://uima.apache.org/" /> + <input name="Search" value="Search Site" type="submit"/> + </form> + </td> + </tr> + <tr> <!-- LEFT SIDE NAVIGATION --> + <td width="20%" valign="top"> + + + + + + + <!-- regular menu --> + <div class="navBar"> + <br/> + <div class="navBarItem"> <div class="navPartHeading">General</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./index.html">Home</a> + </div> + <div class="navBarItem"> <a href="./downloads.cgi">Downloads</a> + </div> + <div class="navBarItem"> <a href="./documentation.html">Documentation</a> + </div> + <div class="navBarItem"> <a href="./news.html">News</a> + </div> + <div class="navBarItem"> <a href="./publications.html">Publications</a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://issues.apache.org/jira/browse/uima" target="_blank" rel="noopener">Issue tracker <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/" target="_blank" rel="noopener">Wiki <img src="images/offsitelink.png"/></a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA" target="_blank" rel="noopener">Powered By UIMA <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Community</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./get-involved.html">Get Involved</a> + </div> + <div class="navBarItem"> <a href="./mail-lists.html">Mailing Lists</a> + </div> + <div class="navBarItem"> <a href="./contribution-policy.html">Contribution Policies</a> + </div> + <div class="navBarItem"> <a href="./faq.html">FAQ</a> + </div> + <div class="navBarItem"> <a href="./project-guidelines.html">Project Guidelines</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Scaleout Frameworks</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./doc-uimaas-what.html">UIMA-AS</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-whatitam.html">UIMA-DUCC</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-demo.html">..Demo Page</a> + </div> + <div class="navBarItem"> <a href="http://uima-ducc-demo.apache.org:42133" target="_blank" rel="noopener">..Demo Live <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Components & Tools</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./sandbox.html#uima-addons-annotators">Annotators</a> + </div> + <div class="navBarItem"> <a href="./toolsServers.html">Tools & Servers</a> + </div> + <div class="navBarItem"> <a href="./sandbox.html">Addons and Sandbox</a> + </div> + <div class="navBarItem"> <a href="./ruta.html">UIMA Ruta</a> + </div> + <div class="navBarItem"> <a href="./uimafit.html">uimaFIT</a> + </div> + <div class="navBarItem"> <a href="./external-resources.html">External Resources</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Development</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./dev-quick.html">Quick Start: building</a> + </div> + <div class="navBarItem"> <a href="./building-uima.html">Building from Source</a> + </div> + <div class="navBarItem"> <a href="./one-time-setup.html">One-time setups</a> + </div> + <div class="navBarItem"> <a href="./svn.html">Source Code</a> + </div> + <div class="navBarItem"> <a href="./distribution.html">Creating a Distribution</a> + </div> + <div class="navBarItem"> <a href="./release.html">Doing a UIMA release</a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/security/committers.html" target="_blank" rel="noopener">Doing a CVE (Apache) <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> + </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> + <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> + </div> + <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> + </div> + <div class="navBarItem"> <a href="./team-list.html">Project Team</a> + </div> + <div class="navBarItem"> <a href="./maven-design.html">Maven Use</a> + </div> + <div class="navBarItem"> <a href="./updating-website.html">Updating this Website</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Events and Conferences</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./coling14.html">COLING 2014</a> + </div> + <div class="navBarItem"> <a href="./gscl13.html">GSCL 2013</a> + </div> + <div class="navBarItem"> <a href="./iks09.html">IKS 2009</a> + </div> + <div class="navBarItem"> <a href="./gscl09.html">GSCL 2009</a> + </div> + <div class="navBarItem"> <a href="./lsm09.html">LSM 2009</a> + </div> + <div class="navBarItem"> <a href="./lrec08.html">LREC 2008</a> + </div> + <div class="navBarItem"> <a href="./gldv07.html">GLDV 2007</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">ASF</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="https://www.apache.org/licenses/" target="_blank" rel="noopener">License <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/thanks.html" target="_blank" rel="noopener">ASF Sponsors <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/sponsorship.html" target="_blank" rel="noopener">ASF Sponsorship <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./security_report">Security</a> + </div> + </div> + </div> + </td> + <td width="80%" align="left" valign="top"> + <div class="sectionTable"> + <table class="sectionTable"> + <tr><td> + <a name="Git Conventions"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Git Conventions</h1></a> + </td></tr> + <tr><td> + <blockquote class="sectionBody"> + <p>This describes various conventions and the reasons behind them, concerning use of GIT.</p> + <h3>Branch naming</h3> + <h4>master</h4> + <p>This is the main branch where things are merged into, and from time to time, releases are made from.</p> + <p>Some project may have multiple branches. These typically reflect on-going versions being developed together.</p> + <h4>branches for working</h4> + <p>Work is done in a branch. This because the master(s) are protected, which means they cannot be "pushed" to, + but rather, a change must be pulled from a branch via a pull request.</p> + <p>Branches for working are typically named using the Jira issue (if there is one) associated with the work, + followed by a very-short-description - enough to remind you what that jira number is about. + In addition, the name can be prefixed with the kind of work it is, e.g. <code>feature/</code> or <code>bugfix</code>. + This can be useful in enabling you to more rapidly locate the right branch.</p> + <p>After merging into master, the branch is typically deleted.</p> + <h4>Git merge styles</h4> + <p>Different projects may use different merge styles.</p> + <p>See these links for references to common work patterns.</p> + </blockquote> + </p> + </td></tr> + </table> + </td> + </tr> + <!-- FOOTER --> + <tr><td colspan="2"> + <hr noshade="" size="1"/> + </td></tr> + <tr><td colspan="2"> + <table class="pageFooter"> + <tr> + <td><a href="index.html">Home</a></td> + <td><a href="privacy-policy.html">Privacy Policy</a></td> + <td style="font-size:75%"> + Copyright © 2006-2013, The Apache Software Foundation.<br/> + Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/> + All other marks mentioned may be trademarks or registered trademarks of their respective owners. + </td> + <td><a href="mailto:d...@uima.apache.org">Contact us</a></td> + </tr> + </table> + </td></tr> + </table> + </body> + </html> + Added: uima/site/trunk/uima-website/docs/git.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git.html?rev=1866489&view=auto ============================================================================== --- uima/site/trunk/uima-website/docs/git.html (added) +++ uima/site/trunk/uima-website/docs/git.html Thu Sep 5 19:56:08 2019 @@ -0,0 +1,264 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd"> + + + <!-- ====================================================================== --> + <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! --> + <!-- ====================================================================== --> + <html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <style type="text/css">@import "stylesheets/base.css";</style> + <meta name="author" value=" Apache UIMA Documentation Team"> + <meta name="email" value="d...@uima.apache.org"> + + + + <title>Apache UIMA - GIT</title> + + <!-- Begin Cookie Consent plugin by Silktide - https://silktide.com/cookieconsent --> + <!-- Commented out because implied consent is not compatible with GDPR --> + <!-- + <script type="text/javascript"> + window.cookieconsent_options = {"message":"This website uses cookies to ensure you get the best experience on our website","dismiss":"Got it!","learnMore":"More info","link":"https://uima.apache.org/privacy-policy.html","theme":"dark-bottom"}; + </script> + + <script type="text/javascript" src="/cookieconsent2/cookieconsent.min.js"></script> + --> + <!-- End Cookie Consent plugin --> + + <!-- Begin Google Analytics --> + <!-- Commented out because GA requires consent according to GDPR --> + <!-- + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-70846351-1', 'auto'); + ga('set', 'anonymizeIp', true); + ga('send', 'pageview'); + + </script> + --> + <!-- End Google Analytics --> + </head> + + <body> + <div class="topLogos"> + <table border="0" width="100%" cellspacing="0"> + <!-- TOP IMAGE --> + <tr> + <td align='LEFT'> + <a href="index.html"> + <img style="border: 1px solid black;" src="./images/UIMA_banner2tlpTm.png" alt="UIMA project logo" border="0"/> + </a> + </td> + <td align='CENTER'> + <div class="pageBanner">GIT</div> + </td> + <td align='RIGHT'> + <a href="https://www.apache.org"> + <img src="./images/asf-logo-on-white-smallTm.png" alt="Apache UIMA" border="0"/> + </a> + </td> + </tr> + </table> + <hr noshade="" size="1"/> + </div> + <table border="0" width="100%" cellspacing="4"> + <tr> + <td align='RIGHT' colspan="2"> + <form method="get" action="https://www.google.com/search"> + Search the site + <input type="text" name="q" size="25" maxlength="255" value="" /> + <input type="hidden" name="sitesearch" value="https://uima.apache.org/" /> + <input name="Search" value="Search Site" type="submit"/> + </form> + </td> + </tr> + <tr> <!-- LEFT SIDE NAVIGATION --> + <td width="20%" valign="top"> + + + + + + + <!-- regular menu --> + <div class="navBar"> + <br/> + <div class="navBarItem"> <div class="navPartHeading">General</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./index.html">Home</a> + </div> + <div class="navBarItem"> <a href="./downloads.cgi">Downloads</a> + </div> + <div class="navBarItem"> <a href="./documentation.html">Documentation</a> + </div> + <div class="navBarItem"> <a href="./news.html">News</a> + </div> + <div class="navBarItem"> <a href="./publications.html">Publications</a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://issues.apache.org/jira/browse/uima" target="_blank" rel="noopener">Issue tracker <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/" target="_blank" rel="noopener">Wiki <img src="images/offsitelink.png"/></a> + </div> + <br style="line-height: .5em"/> + <div class="navBarItem"> <a href="https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA" target="_blank" rel="noopener">Powered By UIMA <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Community</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./get-involved.html">Get Involved</a> + </div> + <div class="navBarItem"> <a href="./mail-lists.html">Mailing Lists</a> + </div> + <div class="navBarItem"> <a href="./contribution-policy.html">Contribution Policies</a> + </div> + <div class="navBarItem"> <a href="./faq.html">FAQ</a> + </div> + <div class="navBarItem"> <a href="./project-guidelines.html">Project Guidelines</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Scaleout Frameworks</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./doc-uimaas-what.html">UIMA-AS</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-whatitam.html">UIMA-DUCC</a> + </div> + <div class="navBarItem"> <a href="./doc-uimaducc-demo.html">..Demo Page</a> + </div> + <div class="navBarItem"> <a href="http://uima-ducc-demo.apache.org:42133" target="_blank" rel="noopener">..Demo Live <img src="images/offsitelink.png"/></a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Components & Tools</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./sandbox.html#uima-addons-annotators">Annotators</a> + </div> + <div class="navBarItem"> <a href="./toolsServers.html">Tools & Servers</a> + </div> + <div class="navBarItem"> <a href="./sandbox.html">Addons and Sandbox</a> + </div> + <div class="navBarItem"> <a href="./ruta.html">UIMA Ruta</a> + </div> + <div class="navBarItem"> <a href="./uimafit.html">uimaFIT</a> + </div> + <div class="navBarItem"> <a href="./external-resources.html">External Resources</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Development</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./dev-quick.html">Quick Start: building</a> + </div> + <div class="navBarItem"> <a href="./building-uima.html">Building from Source</a> + </div> + <div class="navBarItem"> <a href="./one-time-setup.html">One-time setups</a> + </div> + <div class="navBarItem"> <a href="./svn.html">Source Code</a> + </div> + <div class="navBarItem"> <a href="./distribution.html">Creating a Distribution</a> + </div> + <div class="navBarItem"> <a href="./release.html">Doing a UIMA release</a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/security/committers.html" target="_blank" rel="noopener">Doing a CVE (Apache) <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> + </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> + <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> + </div> + <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> + </div> + <div class="navBarItem"> <a href="./team-list.html">Project Team</a> + </div> + <div class="navBarItem"> <a href="./maven-design.html">Maven Use</a> + </div> + <div class="navBarItem"> <a href="./updating-website.html">Updating this Website</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">Events and Conferences</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="./coling14.html">COLING 2014</a> + </div> + <div class="navBarItem"> <a href="./gscl13.html">GSCL 2013</a> + </div> + <div class="navBarItem"> <a href="./iks09.html">IKS 2009</a> + </div> + <div class="navBarItem"> <a href="./gscl09.html">GSCL 2009</a> + </div> + <div class="navBarItem"> <a href="./lsm09.html">LSM 2009</a> + </div> + <div class="navBarItem"> <a href="./lrec08.html">LREC 2008</a> + </div> + <div class="navBarItem"> <a href="./gldv07.html">GLDV 2007</a> + </div> + </div> + <br/> + <div class="navBarItem"> <div class="navPartHeading">ASF</div> + </div> + <div class="navBar"> + <div class="navBarItem"> <a href="https://www.apache.org/licenses/" target="_blank" rel="noopener">License <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/thanks.html" target="_blank" rel="noopener">ASF Sponsors <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="https://www.apache.org/foundation/sponsorship.html" target="_blank" rel="noopener">ASF Sponsorship <img src="images/offsitelink.png"/></a> + </div> + <div class="navBarItem"> <a href="./security_report">Security</a> + </div> + </div> + </div> + </td> + <td width="80%" align="left" valign="top"> + <div class="sectionTable"> + <table class="sectionTable"> + <tr><td> + <a name="Information on GIT use by UIMA projects"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Information on GIT use by UIMA projects</h1></a> + </td></tr> + <tr><td> + <blockquote class="sectionBody"> + <h2>Conventions</h2> + <p>See <a target="_blank" rel="noopener" href="git-conventions">git-conventions</a> for information about the GIT conventions being used.</p> + <h2>Converting a project to GIT</h2> + <p>See <a target="_blank" rel="noopener" href="convert-to-git">convert-to-git</a> for information on the steps to take to move / convert a project from SVN to GIT.</p> + </blockquote> + </p> + </td></tr> + </table> + </td> + </tr> + <!-- FOOTER --> + <tr><td colspan="2"> + <hr noshade="" size="1"/> + </td></tr> + <tr><td colspan="2"> + <table class="pageFooter"> + <tr> + <td><a href="index.html">Home</a></td> + <td><a href="privacy-policy.html">Privacy Policy</a></td> + <td style="font-size:75%"> + Copyright © 2006-2013, The Apache Software Foundation.<br/> + Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/> + All other marks mentioned may be trademarks or registered trademarks of their respective owners. + </td> + <td><a href="mailto:d...@uima.apache.org">Contact us</a></td> + </tr> + </table> + </td></tr> + </table> + </body> + </html> + Modified: uima/site/trunk/uima-website/docs/gldv07.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gldv07.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/gldv07.html (original) +++ uima/site/trunk/uima-website/docs/gldv07.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/gscl09.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gscl09.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/gscl09.html (original) +++ uima/site/trunk/uima-website/docs/gscl09.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/gscl13.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gscl13.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/gscl13.html (original) +++ uima/site/trunk/uima-website/docs/gscl13.html Thu Sep 5 19:56:08 2019 @@ -176,6 +176,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/iks09.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/iks09.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/iks09.html (original) +++ uima/site/trunk/uima-website/docs/iks09.html Thu Sep 5 19:56:08 2019 @@ -178,6 +178,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a> Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1866489&r1=1866488&r2=1866489&view=diff ============================================================================== --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Thu Sep 5 19:56:08 2019 @@ -177,6 +177,8 @@ </div> <div class="navBarItem"> <a href="./eclipse-update-site.html">Eclipse Update Sites</a> </div> + <div class="navBarItem"> <a href="./git.html">GIT</a> + </div> <div class="navBarItem"> <a href="./codeConventions.html">Code Conventions</a> </div> <div class="navBarItem"> <a href="./uima-specification.html">UIMA Specification (OASIS)</a>