You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/06/13 15:33:42 UTC
svn commit: r1748263 - in /ofbiz/branches/release15.12: ./
applications/content/data/helpdata/ applications/product/data/helpdata/
applications/workeffort/config/ specialpurpose/cmssite/documents/
specialpurpose/cmssite/template/ofbiz/
Author: jleroux
Date: Mon Jun 13 15:33:42 2016
New Revision: 1748263
URL: http://svn.apache.org/viewvc?rev=1748263&view=rev
Log:
"Applied fix from trunk for revision: 1748260 " (handled ofbizMain.ftl and ofbizMenu.ftl by hand)
------------------------------------------------------------------------
r1748260 | jleroux | 2016-06-13 17:23:37 +0200 (lun. 13 juin 2016) | 5 lignes
A patch from Ankit Joshi for "http://docs.ofbiz.org/ is wrongly used in content" https://issues.apache.org/jira/browse/OFBIZ-7001
There are 31 occurrences and most use shortcuts. They should be converted to link to the current wiki, of course the previous shortcuts are no longer valid.
We need to replace them by hand, hence 1st find what the old shortcuts were, and then replace them with new shortcuts, or even better real links. We got bitten once by shortcuts, it's enough...
------------------------------------------------------------------------
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
ofbiz/branches/release15.12/applications/product/data/helpdata/HELP_PRODUCT.xml
ofbiz/branches/release15.12/applications/workeffort/config/WorkEffortUiLabels.xml
ofbiz/branches/release15.12/specialpurpose/cmssite/documents/ApacheOfbiz.xml
ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl
ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 15:33:42 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260
Modified: ofbiz/branches/release15.12/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml (original)
+++ ofbiz/branches/release15.12/applications/content/data/helpdata/HELP_CONTENT_SITE_FindWeb.xml Mon Jun 13 15:33:42 2016
@@ -31,7 +31,7 @@
<section>
<title>Subsection 2 title</title>
<para>
- for more info see the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> for more info.
+ for more info see the <link xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home">OFBiz documentation site</link> for more info.
</para>
</section>
</section>
Modified: ofbiz/branches/release15.12/applications/product/data/helpdata/HELP_PRODUCT.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/data/helpdata/HELP_PRODUCT.xml?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/data/helpdata/HELP_PRODUCT.xml (original)
+++ ofbiz/branches/release15.12/applications/product/data/helpdata/HELP_PRODUCT.xml Mon Jun 13 15:33:42 2016
@@ -32,7 +32,7 @@
<title>Subsection 2 title</title>
<para>
The Main catalog help screen. For more information please
- see the <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> for more info.
+ see the <link xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home">OFBiz documentation site</link> for more info.
</para>
</section>
</section>
Modified: ofbiz/branches/release15.12/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/branches/release15.12/applications/workeffort/config/WorkEffortUiLabels.xml Mon Jun 13 15:33:42 2016
@@ -2901,7 +2901,7 @@
<value xml:lang="zh-TW">iCal輔助</value>
</property>
<property key="WorkEffortICalendarHelpUrl">
- <value xml:lang="en">http://docs.ofbiz.org/x/piE</value>
+ <value xml:lang="en">https://cwiki.apache.org/confluence/display/OFBENDUSER/iCalendar+Integration</value>
</property>
<property key="WorkEffortICalendarName">
<value xml:lang="de">Kalendername</value>
Modified: ofbiz/branches/release15.12/specialpurpose/cmssite/documents/ApacheOfbiz.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/cmssite/documents/ApacheOfbiz.xml?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/cmssite/documents/ApacheOfbiz.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/cmssite/documents/ApacheOfbiz.xml Mon Jun 13 15:33:42 2016
@@ -28,7 +28,7 @@
<abstract>
<para>
This Book is currently in an experimental stage. It will be the start of moving the OFBiz documentation from the current
- <link xl:href="http://docs.ofbiz.org">OFBiz documentation site</link> and the old ofbiz website (Entity documents) to the OFBiz content component.
+ <link xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Home">OFBiz documentation site</link> and the old ofbiz website (Entity documents) to the OFBiz content component.
The layout is currently open for discussion by the OFBiz community.
</para>
<para>
Modified: ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl Mon Jun 13 15:33:42 2016
@@ -24,11 +24,11 @@ under the License.
<p><a href="http://us.apachecon.com/c/acus2008/"><img src="http://www.apache.org/ads/ApacheCon/2008-usa-125x125.png" alt="ApacheCon US 2008" align="left"/></a>
<b>CHECK IT OUT!</b> There is a special <a href="http://us.apachecon.com/c/acus2008/schedule/ofbiz-symposium">OFBiz Symposium</a> at <a href="http://us.apachecon.com/c/acus2008/">ApacheCon US 2008</a> in New Orleans on Novemver 3-7. This event includes 2 days of training sessions, 2 days of conference presentations, and BOF sessions in the evening after the conference. Because it is a part of ApacheCon attendees can also enjoy other ApacheCon training and conference sessions and participate in other events including the Hackathon, Barcamp Apache (wiki driven unconference), and the Expo (show floor) which will include companies using OFBiz as well as others. See <a href="http://us.apachecon.com/c/acus2008/schedule/ofbiz-symposium">schedule details here</a>, and <a href="http://guest.cvent.com/i.aspx?4W,M3,e057feb1-c5f1-4430-a0ce-c4d78049759e">register here</a>.</p>
- <p>There are new features every day in OFBiz. For a summary <a href="http://docs.ofbiz.org/x/-Qs">see new feature summary here</a>.</p>
+ <p>There are new features every day in OFBiz. For a summary <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features">see new feature summary here</a>.</p>
<p> - Accounting: auto-posting services in testing and reports in build-out</p>
<p> - Project Management: extension of the WorkEffort and other base components, initially complete and being refined</p>
<p>Free Training Videos are now available that offer an introduction to the Apache OFBiz Framework, based on the example component.
- They can be <a href="http://docs.ofbiz.org/x/PQM">downloaded here</a>.</p>
+ They can be <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams">downloaded here</a>.</p>
</div>
@@ -49,13 +49,13 @@ under the License.
<p>For answers to your questions you might find the following documents useful:
- <a href="http://docs.ofbiz.org/x/lQM">Project Overview</a>,
- <a href="http://docs.ofbiz.org/x/hgM">Is Apache OFBiz for Me?</a>,
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Project+Overview">Project Overview</a>,
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Is+OFBiz+for+Me">Is Apache OFBiz for Me?</a>,
<a href="feature-list.html">Feature List</a>, and
<a href="comingsoon.html">Features Coming Soon</a>
</p>
- <p>For more technical information, see the <a href="http://docs.ofbiz.org/x/Swg">Documentation</a> page.</p>
+ <p>For more technical information, see the <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index">Documentation</a> page.</p>
<p>Apache OFBiz offers a great deal of functionality, including:</p>
@@ -131,7 +131,7 @@ under the License.
<a href="http://store.xinit.com/ecommerce/control/main" target="_blank">***Xinit Systems</a>
<!--a href="http://www.worldfranchisecouncil.org/control/cpview?contentId=WFC_HOME" target="_blank">**World Franchise Council</a-->
</p>
- <p>For a more complete list of sites see the <a href="http://docs.ofbiz.org/x/ZQM">Apache OFBiz User List</a> page.</p>
+ <p>For a more complete list of sites see the <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List">Apache OFBiz User List</a> page.</p>
</div>
<div id="inthenews">
@@ -183,7 +183,7 @@ under the License.
<p>OFBiz is in the Apache Incubator. See the status here: <a href="http://incubator.apache.org/projects/ofbiz.html">here</a>.</p>
<p>Free Training Videos are now available that offer an introduction to the Apache OFBiz Framework, based on the example component.
- They can be downloaded <a href="http://docs.ofbiz.org/x/PQM">here</a>.</p>
+ They can be downloaded <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams">here</a>.</p>
<p>The 2005 OFBiz Users Conference turned out Great! The video recordings are available <a href="VideosConf.html">here</a>.</p>
@@ -200,7 +200,7 @@ under the License.
<p>New Case Study from Integral Business Solutions about their projects
based on Apache OFBiz, especially recent work they have done for the US Air Force. <a href="IntegralAirForceCaseStudy.pdf">Download the complete document here.</a></p>
- <p>Apache OFBiz Basic Production Setup document Now Available: <a href="http://docs.ofbiz.org/x/j">Apache OFBiz Production Setup Guide</a>.
+ <p>Apache OFBiz Basic Production Setup document Now Available: <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Technical+Production+Setup+Guide">Apache OFBiz Production Setup Guide</a>.
This is a free download meant to help you get going with Apache OFBiz. It is sponsored by
<a href="http://www.hotwaxmedia.com/?atc=OFB" target="_blank">Hotwax Media</a> and
<a href="http://www.go-integral.com" target="_blank">Integral Business Solutions</a>.
Modified: ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl?rev=1748263&r1=1748262&r2=1748263&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl (original)
+++ ofbiz/branches/release15.12/specialpurpose/cmssite/template/ofbiz/ofbizMenu.ftl Mon Jun 13 15:33:42 2016
@@ -19,18 +19,18 @@ under the License.
<div id="link-column">
<h2>What is Apache OFBiz?</h2>
- <a href="http://docs.ofbiz.org/x/lQM">Project Overview</a>
- <a href="http://docs.ofbiz.org/x/hgM">Is OFBiz for Me?</a>
- <a href="http://docs.ofbiz.org/x/-Qs">Main New Features</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Project+Overview">Project Overview</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Is+OFBiz+for+Me">Is OFBiz for Me?</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features">Main New Features</a>
<a href="comingsoon.html">Features Coming Soon</a>
<a href="feature-list.html">Feature List</a>
- <a href="http://docs.ofbiz.org/x/ZQM">User List</a>
- <a href="http://docs.ofbiz.org/x/UwM">User Stories</a>
- <a href="http://docs.ofbiz.org/x/jQM">Brochures, etc</a>
- <a href="http://docs.ofbiz.org/x/Swg">Documentation</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List">User List</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+Stories">User Stories</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/General+Material+for+Branding+and+Marketing">Brochures, etc</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index">Documentation</a>
<a href="VideosConf.html">Conference Videos</a>
- <a href="http://docs.ofbiz.org/x/PQM">Framework Intro Videos</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Framework+Introduction+Videos+and+Diagrams">Framework Intro Videos</a>
<h2>Demo Sites</h2>
@@ -45,26 +45,26 @@ under the License.
<a href="http://docs.ofbiz.org/x/yg4" target="_blank">Alternative Demo Servers</a>
<h2>Download OFBiz</h2>
- <a href="http://docs.ofbiz.org/x/rwM">Getting Started (Read this first)</a>
- <a href="http://docs.ofbiz.org/x/mAM">Copyright & License</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+Getting+Started">Getting Started (Read this first)</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Copyright+and+License">Copyright & License</a>
- <a href="http://docs.ofbiz.org/x/mgM">Source Access (Recommended)</a>
+ <a href="https://ofbiz.apache.org/source-repositories.html">Source Access (Recommended)</a>
<a href="http://build.hotwaxmedia.com/">Nightly Builds (Ready to use)</a>
<h2>Resources & Tools</h2>
- <a href="http://docs.ofbiz.org/x/Swg">Main Documentation Page</a>
- <a href="http://docs.ofbiz.org/x/yAk">Mailing Lists</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Documentation+Index">Main Documentation Page</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mailing+Lists">Mailing Lists</a>
<a href="https://issues.apache.org/jira/browse/OFBIZ">Issue Tracker (Jira)</a>
- <a href="http://docs.ofbiz.org/x/mgM">Source Repository (SVN)</a>
+ <a href="https://ofbiz.apache.org/source-repositories.html">Source Repository (SVN)</a>
<a href="http://fisheye6.cenqua.com/browse/ofbiz">Source Browse and Stats (Fisheye)</a>
<!-- no RSS feed any more... <a href="http://www.ofbiz.org/rss/svnlog.rss">SVN Commit RSS Feed</a> -->
<a href="http://api.ofbiz.org/">API Reference (Javadoc)</a>
<a href="http://cwiki.apache.org/confluence/display/OFBIZ">Documentation Site: Wiki</a>
<a href="VideosConf.html">Conference Videos</a>
- <a href="http://docs.ofbiz.org/x/QQg">Books</a>
- <a href="http://docs.ofbiz.org/x/SgU">Open Source Projects, Standards</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Related+Books">Books</a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Open+Source+Projects+and+Standards">Open Source Projects, Standards</a>
<!-- DEJ20080122 commenting these out, may want to totally remove eventually as they are only of interest for historical purposes
<h2>Old Resources</h2>
@@ -99,7 +99,7 @@ under the License.
<a href="http://www.openegovernment.org">Government</a>
<h2>Service Providers</h2>
- <a href="http://docs.ofbiz.org/x/JAM" target="_blank"><b>Complete Listing on Wiki</b></a>
+ <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Service+Providers" target="_blank"><b>Complete Listing on Wiki</b></a>
<a href="http://www.hotwaxmedia.com/?atc=OFB" target="_blank"><b>Hotwax Media</b></a>
<a href="http://www.antwebsystems.com" target="_blank"><b>Ant Websystems</b></a>
<a href="http://www.opensourcestrategies.com/ofbiz/" target="_blank"><b>Open Source Strategies, Inc.</b></a>