You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/30 23:35:26 UTC
svn commit: r929308 - in /harmony/standard/site/branches/live: ./ docs/
docs/subcomponents/buildtest/ docs/subcomponents/classlibrary/
docs/subcomponents/drlvm/ xdocs/ xdocs/subcomponents/buildtest/
xdocs/subcomponents/classlibrary/ xdocs/subcomponents...
Author: hindessm
Date: Tue Mar 30 21:35:25 2010
New Revision: 929308
URL: http://svn.apache.org/viewvc?rev=929308&view=rev
Log:
Merging from trunk@929301.
Modified:
harmony/standard/site/branches/live/ (props changed)
harmony/standard/site/branches/live/docs/download.html
harmony/standard/site/branches/live/docs/issue_resolution_guideline.html
harmony/standard/site/branches/live/docs/quickhelp_contributors.html
harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html
harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html
harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html
harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html
harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html
harmony/standard/site/branches/live/docs/svn.html
harmony/standard/site/branches/live/xdocs/download.xml
harmony/standard/site/branches/live/xdocs/issue_resolution_guideline.xml
harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml
harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml
harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/howto.xml
harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/agreements.xml
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DeveloperGuide.html
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DoxygenStart.xml
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/GCv5.html
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/NCAI.html
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml
harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/kernel_classes.html
harmony/standard/site/branches/live/xdocs/svn.xml
Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:25 2010
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-921992
+/harmony/standard/site/trunk:822221-929301
Modified: harmony/standard/site/branches/live/docs/download.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/download.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/download.html (original)
+++ harmony/standard/site/branches/live/docs/download.html Tue Mar 30 21:35:25 2010
@@ -212,7 +212,7 @@ limitations under the License.
source code, refer to <a href="quickhelp_contributors.html">Getting Started For
Contributors</a>. For instructions on how to build from local resources instead of
downloading them from the net, refer to the
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/README.txt?view=co">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/README.txt?view=co">
README file</a>.
</p>
<p>
Modified: harmony/standard/site/branches/live/docs/issue_resolution_guideline.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/issue_resolution_guideline.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/issue_resolution_guideline.html (original)
+++ harmony/standard/site/branches/live/docs/issue_resolution_guideline.html Tue Mar 30 21:35:25 2010
@@ -261,7 +261,7 @@ limitations under the License.
Add a link to the discussion as a comment.</li>
<li>All patches, such as tests and fixes, should be relative to the directory where
the main <code>build.xml</code> is:<br />
- <code>http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk</code>,<br />
+ <code>http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib</code>,<br />
or to the module root directory.</li>
<li>Test and fix patches should be in different files.</li>
<li>If the patch requires adding, removing or moving some files in the repository,
Modified: harmony/standard/site/branches/live/docs/quickhelp_contributors.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/quickhelp_contributors.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.html Tue Mar 30 21:35:25 2010
@@ -414,14 +414,14 @@ limitations under the License.
<p>
To check out the federated build, use the following command:
</p>
- <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/trunk </pre>
+ <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk </pre>
<p>
This command checks out a directory structure that contains
- <code>common_resources</code>, <code>working_classlib</code>,
- <code>working_vm</code> and <code>working_jdktools</code> directories.
+ <code>common_resources</code>, <code>classlib</code>,
+ <code>drlvm</code> and <code>jdktools</code> directories.
The federated build command in the next step will populate the source
- trees and build the JDK, <code>working_classlib</code> will be the
- checkout of the class library SVN tree, <code>working_vm</code> will be
+ trees and build the JDK, <code>classlib</code> will be the
+ checkout of the class library SVN tree, <code>drlvm</code> will be
the checkout of the DRLVM SVN tree, etc.
</p>
<p class="note">Note</p>
@@ -511,7 +511,7 @@ limitations under the License.
<pre>$ ant populate-src</pre>
<p>
The given command checks out class library, DRLVM and jdktools into the
- <code>working_classlib</code>, <code>working_vm</code> and <code>working_jdktools</code>
+ <code>classlib</code>, <code>drlvm</code> and <code>jdktools</code>
directories respectively, along with a <code>common_resources</code>, <i>
at the same SVN version of
the <code>build.xml</code> file
@@ -536,7 +536,7 @@ limitations under the License.
revision simply by doing <code>svn update</code> in any directory.
</p>
<pre>
-$ cd working_classlib
+$ cd classlib
$ svn update</pre>
<p>
After executing <code>svn update</code>, your tree will
@@ -575,7 +575,7 @@ $ svn update</pre>
and then build the component, use the following commands:
</p>
<pre>
-$ cd working_classlib
+$ cd classlib
$ ant fetch-depends
$ ant</pre>
<p>
Modified: harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html Tue Mar 30 21:35:25 2010
@@ -324,14 +324,14 @@ limitations under the License.
<p>ÐÐ»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð³ÑÑзиÑÑ ÑедеÑаÑивнÑÑ ÑиÑÑÐµÐ¼Ñ ÑбоÑки из SVN ÑепозиÑоÑиÑ, иÑполÑзÑйÑе
ÑледÑÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ:
</p>
- <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/trunk</pre>
+ <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk</pre>
<p>ÐÐ°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÑоздаÑÑ Ð¿ÑÑÑÑе диÑекÑоÑии
- <code>common_resources</code>, <code>working_classlib</code>,
- <code>working_vm</code> и <code>working_jdktools</code>. Ðа ÑледÑÑÑем
+ <code>common_resources</code>, <code>classlib</code>,
+ <code>drlvm</code> и <code>jdktools</code>. Ðа ÑледÑÑÑем
ÑÑапе ÑедеÑаÑÐ¸Ð²Ð½Ð°Ñ ÑиÑÑема ÑбоÑки загÑÑÐ·Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ
одимÑй иÑÑ
однÑй код и
- ÑобеÑÑÑ JDK. ÐиÑекÑоÑÐ¸Ñ <code>working_classlib</code> бÑÐ´ÐµÑ ÑодеÑжаÑÑ
+ ÑобеÑÑÑ JDK. ÐиÑекÑоÑÐ¸Ñ <code>classlib</code> бÑÐ´ÐµÑ ÑодеÑжаÑÑ
ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов библиоÑеки клаÑÑов, диÑекÑоÑиÑ
- <code>working_vm</code> - ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов DRLVM, и Ñак далее.
+ <code>drlvm</code> - ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов DRLVM, и Ñак далее.
</p>
<p><strong>ÐÑимеÑание</strong>: в ÐС Windows, еÑли коÑÐ½ÐµÐ²Ð°Ñ Ð´Ð¸ÑекÑоÑÐ¸Ñ ÑиÑÑÐµÐ¼Ñ ÑбоÑки наÑ
одиÑÑÑ
на много ÑÑовней ниже коÑневого каÑалога, излиÑне длиннÑй пÑÑÑ Ðº библиоÑеке клаÑÑов Ð¼Ð¾Ð¶ÐµÑ Ð²ÑзваÑÑ
@@ -396,8 +396,8 @@ limitations under the License.
</p>
<pre>$ ant populate-src</pre>
<p>ÐÐ°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÑкаÑÐ¸Ð²Ð°ÐµÑ Ð¸Ð· SVN ÑепозиÑоÑÐ¸Ñ Ð¸ÑÑ
однÑе ÑекÑÑÑ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñек клаÑÑов,
- ÐРи ÑÑÐ¸Ð»Ð¸Ñ Ð² диÑекÑоÑии <code>working_classlib</code>,
- <code>working_vm</code> и <code>working_jdktools</code> ÑооÑвеÑÑÑвенно,
+ ÐРи ÑÑÐ¸Ð»Ð¸Ñ Ð² диÑекÑоÑии <code>classlib</code>,
+ <code>drlvm</code> и <code>jdktools</code> ÑооÑвеÑÑÑвенно,
пÑиÑем веÑÑÐ¸Ñ Ð¸Ð·Ð²Ð»ÐµÑенного кода ÑооÑвеÑÑÑвÑÐµÑ Ð²ÐµÑÑии Ñайла <code>build.xml</code>.
ÐоÑколÑÐºÑ Ð´ÐµÑево каÑалогов доволÑно велико, загÑÑзка вÑеÑ
каÑалогов Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð¿ÑодолжиÑелÑное вÑемÑ. </p>
<p>
@@ -414,7 +414,7 @@ limitations under the License.
<p>Ðо пÑоÑеÑÑвии вÑемени, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе ÑинÑ
ÑонизиÑоваÑÑ Ð²Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¸ÑÑ
одного кода Ñ ÑекÑÑей веÑÑией
в SVN ÑепозиÑоÑии, вÑзÑÐ²Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ <code>svn update</code> в нÑжной диÑекÑоÑии, напÑимеÑ:
</p>
- <pre>$ cd working_classlib
+ <pre>$ cd classlib
$ svn update</pre>
<p>Таким ÑпоÑобом Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе полÑÑаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð´Ð° лÑбого из компоненÑ.
ÐоÑле иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð² ваÑем деÑеве каÑалогов оÑобÑазÑÑÑÑ Ð²Ñе изменениÑ, внеÑеннÑе в
@@ -447,7 +447,7 @@ $ svn update</pre>
Ñак ÑÑо пÑоÑедÑÑÑ Ð·Ð°Ð³ÑÑзки внеÑниÑ
ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑебÑеÑÑÑ Ð¿ÐµÑиодиÑеÑки повÑоÑÑÑÑ. </p>
<p>ÐÐ»Ñ Ð·Ð°Ð³ÑÑзки внеÑниÑ
ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¸ ÑбоÑки библиоÑеки клаÑÑов иÑполÑзÑйÑе ÑледÑÑÑие командÑ:
</p>
- <pre>$ cd working_classlib
+ <pre>$ cd classlib
$ ant fetch-depends
$ ant</pre>
<p> ТепеÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе пÑоÑеÑÑиÑоваÑÑ ÑезÑлÑÑаÑÑ ÑбоÑки. ÐÐ°Ð¶Ð´Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ Ð²ÐºÐ»ÑÑаеÑ
Modified: harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html Tue Mar 30 21:35:25 2010
@@ -313,20 +313,20 @@ jdktools-test.parameters.depends=hdk
# Tests are run in HDK workspace against HDK's JRE
classlib-test.parameters.required.tested.jre=${hdk.parameters.shared.binaries.jre.dir}
-classlib-test.parameters.svn.classlib.dir=hdk/working_classlib
+classlib-test.parameters.svn.classlib.dir=hdk/classlib
drlvm-test.parameters.required.hy.hdk=${hdk.parameters.shared.trunk.dir}/target/hdk
drlvm-test.parameters.required.drlvm.config=debug
-drlvm-test.parameters.svn.drlvm.dir=hdk/working_vm
+drlvm-test.parameters.svn.drlvm.dir=hdk/drlvm
drlvm-test.parameters.svn.common_resources.dir=hdk/common_resources
drlvm-reg-test.parameters.required.hy.hdk=${hdk.parameters.shared.trunk.dir}/target/hdk
drlvm-reg-test.parameters.required.drlvm.config=debug
-drlvm-reg-test.parameters.svn.drlvm.dir=hdk/working_vm
+drlvm-reg-test.parameters.svn.drlvm.dir=hdk/drlvm
drlvm-reg-test.parameters.svn.common_resources.dir=hdk/common_resources
jdktools-test.parameters.required.tested.jre=${hdk.parameters.shared.binaries.jre.dir}
-jdktools-test.parameters.svn.jdktools.dir=hdk/working_jdktools
+jdktools-test.parameters.svn.jdktools.dir=hdk/jdktools
jdktools-test.parameters.svn.common_resources.dir=hdk/common_resources
</pre>
</p>
Modified: harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html Tue Mar 30 21:35:25 2010
@@ -296,7 +296,7 @@ limitations under the License.
<li>
Throws clause of stub method should include
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java?view=markup">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java?view=markup">
NotImplementedException</a> to be recognized by Japi tool.<br />
<a href="http://mail-archives.apache.org/mod_mbox/harmony-dev/200611.mbox/%3cba76afd90611071842w264a2519q1f5a123154759ad6@mail.gmail.com%3e">
Japi diffs for harmony</a>
Modified: harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html Tue Mar 30 21:35:25 2010
@@ -256,7 +256,7 @@ You can locally regenerate reference mat
<ol>
<li>Check out the source code tree. Run <code>svn update</code> to make sure you have the latest version of doc-generation support files.
</li>
-<li>Go to the directory <code>trunk/working_vm/vm/doc</code> and run:
+<li>Go to the directory <code>trunk/drlvm/vm/doc</code> and run:
<pre>$ ant</pre>
</li>
</ol>
Modified: harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html Tue Mar 30 21:35:25 2010
@@ -228,7 +228,7 @@ limitations under the License.
<ul>
<li>
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/README.txt?view=co">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/README.txt?view=co">
README</a>
<br />
Source package and building instructions for the VM source code.
Modified: harmony/standard/site/branches/live/docs/svn.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/svn.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/svn.html (original)
+++ harmony/standard/site/branches/live/docs/svn.html Tue Mar 30 21:35:25 2010
@@ -244,7 +244,7 @@ limitations under the License.
</p>
<h3>Check out from Subversion</h3>
<p>Again, anyone can do this. Use a command like:</p>
- <pre>svn checkout http://svn.apache.org/repos/asf/harmony/enhanced/trunk</pre>
+ <pre>svn checkout http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk</pre>
<h3>Commit Changes to Subversion</h3>
<p>
Any Harmony committer should have a shell account on
Modified: harmony/standard/site/branches/live/xdocs/download.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/download.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/download.xml (original)
+++ harmony/standard/site/branches/live/xdocs/download.xml Tue Mar 30 21:35:25 2010
@@ -37,7 +37,7 @@
source code, refer to <a href="quickhelp_contributors.html">Getting Started For
Contributors</a>. For instructions on how to build from local resources instead of
downloading them from the net, refer to the
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/README.txt?view=co">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/README.txt?view=co">
README file</a>.
</p>
Modified: harmony/standard/site/branches/live/xdocs/issue_resolution_guideline.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/issue_resolution_guideline.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/issue_resolution_guideline.xml (original)
+++ harmony/standard/site/branches/live/xdocs/issue_resolution_guideline.xml Tue Mar 30 21:35:25 2010
@@ -81,7 +81,7 @@
Add a link to the discussion as a comment.</li>
<li>All patches, such as tests and fixes, should be relative to the directory where
the main <code>build.xml</code> is:<br/>
- <code>http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk</code>,<br/>
+ <code>http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib</code>,<br/>
or to the module root directory.</li>
<li>Test and fix patches should be in different files.</li>
<li>If the patch requires adding, removing or moving some files in the repository,
Modified: harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml Tue Mar 30 21:35:25 2010
@@ -150,14 +150,14 @@
<p>ÐÐ»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð³ÑÑзиÑÑ ÑедеÑаÑивнÑÑ ÑиÑÑÐµÐ¼Ñ ÑбоÑки из SVN ÑепозиÑоÑиÑ, иÑполÑзÑйÑе
ÑледÑÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ:
</p>
- <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/trunk</pre>
+ <pre>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk</pre>
<p>ÐÐ°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÑоздаÑÑ Ð¿ÑÑÑÑе диÑекÑоÑии
- <code>common_resources</code>, <code>working_classlib</code>,
- <code>working_vm</code> и <code>working_jdktools</code>. Ðа ÑледÑÑÑем
+ <code>common_resources</code>, <code>classlib</code>,
+ <code>drlvm</code> и <code>jdktools</code>. Ðа ÑледÑÑÑем
ÑÑапе ÑедеÑаÑÐ¸Ð²Ð½Ð°Ñ ÑиÑÑема ÑбоÑки загÑÑÐ·Ð¸Ñ Ð½ÐµÐ¾Ð±Ñ
одимÑй иÑÑ
однÑй код и
- ÑобеÑÑÑ JDK. ÐиÑекÑоÑÐ¸Ñ <code>working_classlib</code> бÑÐ´ÐµÑ ÑодеÑжаÑÑ
+ ÑобеÑÑÑ JDK. ÐиÑекÑоÑÐ¸Ñ <code>classlib</code> бÑÐ´ÐµÑ ÑодеÑжаÑÑ
ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов библиоÑеки клаÑÑов, диÑекÑоÑиÑ
- <code>working_vm</code> - ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов DRLVM, и Ñак далее.
+ <code>drlvm</code> - ÐºÐ¾Ð¿Ð¸Ñ Ð´ÐµÑева каÑалогов DRLVM, и Ñак далее.
</p>
<p><strong>ÐÑимеÑание</strong>: в ÐС Windows, еÑли коÑÐ½ÐµÐ²Ð°Ñ Ð´Ð¸ÑекÑоÑÐ¸Ñ ÑиÑÑÐµÐ¼Ñ ÑбоÑки наÑ
одиÑÑÑ
на много ÑÑовней ниже коÑневого каÑалога, излиÑне длиннÑй пÑÑÑ Ðº библиоÑеке клаÑÑов Ð¼Ð¾Ð¶ÐµÑ Ð²ÑзваÑÑ
@@ -217,8 +217,8 @@
</p>
<pre>$ ant populate-src</pre>
<p>ÐÐ°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÑкаÑÐ¸Ð²Ð°ÐµÑ Ð¸Ð· SVN ÑепозиÑоÑÐ¸Ñ Ð¸ÑÑ
однÑе ÑекÑÑÑ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñек клаÑÑов,
- ÐРи ÑÑÐ¸Ð»Ð¸Ñ Ð² диÑекÑоÑии <code>working_classlib</code>,
- <code>working_vm</code> и <code>working_jdktools</code> ÑооÑвеÑÑÑвенно,
+ ÐРи ÑÑÐ¸Ð»Ð¸Ñ Ð² диÑекÑоÑии <code>classlib</code>,
+ <code>drlvm</code> и <code>jdktools</code> ÑооÑвеÑÑÑвенно,
пÑиÑем веÑÑÐ¸Ñ Ð¸Ð·Ð²Ð»ÐµÑенного кода ÑооÑвеÑÑÑвÑÐµÑ Ð²ÐµÑÑии Ñайла <code>build.xml</code>.
ÐоÑколÑÐºÑ Ð´ÐµÑево каÑалогов доволÑно велико, загÑÑзка вÑеÑ
каÑалогов Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°Ð½ÑÑÑ Ð¿ÑодолжиÑелÑное вÑемÑ. </p>
<p>
@@ -233,7 +233,7 @@
<p>Ðо пÑоÑеÑÑвии вÑемени, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе ÑинÑ
ÑонизиÑоваÑÑ Ð²Ð°ÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¸ÑÑ
одного кода Ñ ÑекÑÑей веÑÑией
в SVN ÑепозиÑоÑии, вÑзÑÐ²Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ <code>svn update</code> в нÑжной диÑекÑоÑии, напÑимеÑ:
</p>
- <pre>$ cd working_classlib
+ <pre>$ cd classlib
$ svn update</pre>
<p>Таким ÑпоÑобом Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе полÑÑаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð´Ð° лÑбого из компоненÑ.
ÐоÑле иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð² ваÑем деÑеве каÑалогов оÑобÑазÑÑÑÑ Ð²Ñе изменениÑ, внеÑеннÑе в
@@ -264,7 +264,7 @@ $ svn update</pre>
Ñак ÑÑо пÑоÑедÑÑÑ Ð·Ð°Ð³ÑÑзки внеÑниÑ
ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑебÑеÑÑÑ Ð¿ÐµÑиодиÑеÑки повÑоÑÑÑÑ. </p>
<p>ÐÐ»Ñ Ð·Ð°Ð³ÑÑзки внеÑниÑ
ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¸ ÑбоÑки библиоÑеки клаÑÑов иÑполÑзÑйÑе ÑледÑÑÑие командÑ:
</p>
- <pre>$ cd working_classlib
+ <pre>$ cd classlib
$ ant fetch-depends
$ ant</pre>
<p> ТепеÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе пÑоÑеÑÑиÑоваÑÑ ÑезÑлÑÑаÑÑ ÑбоÑки. ÐÐ°Ð¶Ð´Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ Ð²ÐºÐ»ÑÑаеÑ
Modified: harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml Tue Mar 30 21:35:25 2010
@@ -228,15 +228,15 @@
To check out the federated build, use the following command:
</p>
- <source>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/trunk </source>
+ <source>$ svn co http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk </source>
<p>
This command checks out a directory structure that contains
- <code>common_resources</code>, <code>working_classlib</code>,
- <code>working_vm</code> and <code>working_jdktools</code> directories.
+ <code>common_resources</code>, <code>classlib</code>,
+ <code>drlvm</code> and <code>jdktools</code> directories.
The federated build command in the next step will populate the source
- trees and build the JDK, <code>working_classlib</code> will be the
- checkout of the class library SVN tree, <code>working_vm</code> will be
+ trees and build the JDK, <code>classlib</code> will be the
+ checkout of the class library SVN tree, <code>drlvm</code> will be
the checkout of the DRLVM SVN tree, etc.
</p>
<p class="note">Note</p>
@@ -317,7 +317,7 @@
<source>$ ant populate-src</source>
<p>
The given command checks out class library, DRLVM and jdktools into the
- <code>working_classlib</code>, <code>working_vm</code> and <code>working_jdktools</code>
+ <code>classlib</code>, <code>drlvm</code> and <code>jdktools</code>
directories respectively, along with a <code>common_resources</code>, <i>
at the same SVN version of
the <code>build.xml</code> file
@@ -339,7 +339,7 @@
</p>
<source>
-$ cd working_classlib
+$ cd classlib
$ svn update</source>
<p>
@@ -376,7 +376,7 @@ $ svn update</source>
and then build the component, use the following commands:
</p>
<source>
-$ cd working_classlib
+$ cd classlib
$ ant fetch-depends
$ ant</source>
<p>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/howto.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/howto.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/howto.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/buildtest/howto.xml Tue Mar 30 21:35:25 2010
@@ -137,20 +137,20 @@ jdktools-test.parameters.depends=hdk
# Tests are run in HDK workspace against HDK's JRE
classlib-test.parameters.required.tested.jre=${hdk.parameters.shared.binaries.jre.dir}
-classlib-test.parameters.svn.classlib.dir=hdk/working_classlib
+classlib-test.parameters.svn.classlib.dir=hdk/classlib
drlvm-test.parameters.required.hy.hdk=${hdk.parameters.shared.trunk.dir}/target/hdk
drlvm-test.parameters.required.drlvm.config=debug
-drlvm-test.parameters.svn.drlvm.dir=hdk/working_vm
+drlvm-test.parameters.svn.drlvm.dir=hdk/drlvm
drlvm-test.parameters.svn.common_resources.dir=hdk/common_resources
drlvm-reg-test.parameters.required.hy.hdk=${hdk.parameters.shared.trunk.dir}/target/hdk
drlvm-reg-test.parameters.required.drlvm.config=debug
-drlvm-reg-test.parameters.svn.drlvm.dir=hdk/working_vm
+drlvm-reg-test.parameters.svn.drlvm.dir=hdk/drlvm
drlvm-reg-test.parameters.svn.common_resources.dir=hdk/common_resources
jdktools-test.parameters.required.tested.jre=${hdk.parameters.shared.binaries.jre.dir}
-jdktools-test.parameters.svn.jdktools.dir=hdk/working_jdktools
+jdktools-test.parameters.svn.jdktools.dir=hdk/jdktools
jdktools-test.parameters.svn.common_resources.dir=hdk/common_resources
</pre>
</p>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/agreements.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/agreements.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/agreements.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/agreements.xml Tue Mar 30 21:35:25 2010
@@ -118,7 +118,7 @@ limitations under the License.
<li>
Throws clause of stub method should include
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java?view=markup">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/NotImplementedException.java?view=markup">
NotImplementedException</a> to be recognized by Japi tool.<br />
<a href="http://mail-archives.apache.org/mod_mbox/harmony-dev/200611.mbox/%3cba76afd90611071842w264a2519q1f5a123154759ad6@mail.gmail.com%3e">
Japi diffs for harmony</a>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DeveloperGuide.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DeveloperGuide.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DeveloperGuide.html (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DeveloperGuide.html Tue Mar 30 21:35:25 2010
@@ -3467,7 +3467,7 @@ header file.<br>
Library Porting Documentation, <a
href="http://svn.apache.org/viewvc/"
target="_blank">http://svn.apache.org/viewvc/</a>
- *checkout*/harmony/enhanced/classlib/trunk/doc/vm_doc/html/index.html?content-type=text%2Fplain</p>
+ *checkout*/harmony/enhanced/java/trunk/classlib/doc/vm_doc/html/index.html?content-type=text%2Fplain</p>
<p>
[<a id="CodePosit_ref" name="CodePosit_ref"></a>21]Karl Pettis, Robert
C. Hansen, <em>Profile Guided Code Positioning</em>, <a
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DoxygenStart.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DoxygenStart.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DoxygenStart.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/DoxygenStart.xml Tue Mar 30 21:35:25 2010
@@ -71,7 +71,7 @@ You can locally regenerate reference mat
<ol>
<li>Check out the source code tree. Run <code>svn update</code> to make sure you have the latest version of doc-generation support files.
</li>
-<li>Go to the directory <code>trunk/working_vm/vm/doc</code> and run:
+<li>Go to the directory <code>trunk/drlvm/vm/doc</code> and run:
<pre>$ ant</pre>
</li>
</ol>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/GCv5.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/GCv5.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/GCv5.html (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/GCv5.html Tue Mar 30 21:35:25 2010
@@ -302,7 +302,7 @@ name="_Object_references"></a>3.3
remains two 32-bit words (or one 64-bit word). </p>
<h2><a
name="code_overview"></a>3.4 Code Overview</h2>
-<p>The GC v5 source tree under the <code>working_vm/vm/gc_gen</code> main directory has the following
+<p>The GC v5 source tree under the <code>drlvm/vm/gc_gen</code> main directory has the following
structure:</p>
<ul>
<li><code>src</code> - the GCv5 implementation main body written in pure C language; consists
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/NCAI.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/NCAI.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/NCAI.html (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/NCAI.html Tue Mar 30 21:35:25 2010
@@ -85,8 +85,8 @@
</p>
<p>
Examples of NCAI usage can be found in NCAI tests sources:
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/tests/ncai/">
- drlvm/trunk/vm/tests/ncai</a>.
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/tests/ncai/">
+ trunk/drlvm/vm/tests/ncai</a>.
</p>
<p class="backtotop">
@@ -154,10 +154,10 @@
<p>
NCAI is implemented as a part of DRLVM. The source code is generally
located in the <a
- href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/">
- drlvm/trunk/vm/vmcore/src/ncai</a> directory,
+ href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/ncai/">
+ trunk/drlvm/vm/vmcore/src/ncai</a> directory,
with platform-dependent code in
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/ncai/utils/">
'utils'</a> subdirectory.
</p>
<p>
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml Tue Mar 30 21:35:25 2010
@@ -50,7 +50,7 @@
<subsection name="Developing and Building the code">
<ul>
<li>
- <a href="http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/README.txt?view=co">
+ <a href="http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/README.txt?view=co">
README</a>
<br />
Source package and building instructions for the VM source code.
Modified: harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/kernel_classes.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/kernel_classes.html?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/kernel_classes.html (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/kernel_classes.html Tue Mar 30 21:35:25 2010
@@ -503,7 +503,7 @@ Java_java_lang_VMThreadManager_currentTh
[<a id="HarmonyClasslib_ref" name="HarmonyClasslib_ref"></a>1] Harmony
Class Library Porting Documentation, <a target="_blank"
href="http://svn.apache.org/viewcvs.cgi/">http://svn.apache.org/viewcvs.cgi/</a>
- *checkout*/harmony/enhanced/classlib/trunk/doc/kernel_doc/html/index.html
+ *checkout*/harmony/enhanced/java/trunk/classlib/doc/kernel_doc/html/index.html
</p>
<p>
[<a id="JNI_ref" name="JNI_ref" target="_blank"></a>2] Java Native Interface Specification, <a
Modified: harmony/standard/site/branches/live/xdocs/svn.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/svn.xml?rev=929308&r1=929307&r2=929308&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/svn.xml (original)
+++ harmony/standard/site/branches/live/xdocs/svn.xml Tue Mar 30 21:35:25 2010
@@ -61,7 +61,7 @@
<h3>Check out from Subversion</h3>
<p>Again, anyone can do this. Use a command like:</p>
- <pre>svn checkout http://svn.apache.org/repos/asf/harmony/enhanced/trunk</pre>
+ <pre>svn checkout http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk</pre>
<h3>Commit Changes to Subversion</h3>
<p>