harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjanu...@apache.org
Subject svn commit: r1030436 - in /harmony/standard/site/branches/live: ./ docs/ docs/documentation/ docs/subcomponents/classlibrary/ docs/subcomponents/drlvm/ xdocs/ xdocs/documentation/ xdocs/subcomponents/classlibrary/ xdocs/subcomponents/drlvm/
Date Wed, 03 Nov 2010 12:38:03 GMT
Author: sjanuary
Date: Wed Nov  3 12:38:02 2010
New Revision: 1030436

URL: http://svn.apache.org/viewvc?rev=1030436&view=rev
Log:
Merging addition of trademark symbols, removal of invalid link and change to project description
on download page

Modified:
    harmony/standard/site/branches/live/   (props changed)
    harmony/standard/site/branches/live/docs/bundles.html
    harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
    harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
    harmony/standard/site/branches/live/docs/download.html
    harmony/standard/site/branches/live/docs/index.html
    harmony/standard/site/branches/live/docs/index.ru.html
    harmony/standard/site/branches/live/docs/newshistory.html
    harmony/standard/site/branches/live/docs/newshistory.ru.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/related.html
    harmony/standard/site/branches/live/docs/sitemap.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html
    harmony/standard/site/branches/live/xdocs/bundles.xml
    harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml
    harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml
    harmony/standard/site/branches/live/xdocs/download.xml
    harmony/standard/site/branches/live/xdocs/index.ru.xml
    harmony/standard/site/branches/live/xdocs/index.xml
    harmony/standard/site/branches/live/xdocs/newshistory.ru.xml
    harmony/standard/site/branches/live/xdocs/newshistory.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/related.xml
    harmony/standard/site/branches/live/xdocs/sitemap.xml
    harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/index.xml
    harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/pkgnaming.xml
    harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml

Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  3 12:38:02 2010
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-1030393
+/harmony/standard/site/trunk:822221-1030434

Modified: harmony/standard/site/branches/live/docs/bundles.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/bundles.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/bundles.html (original)
+++ harmony/standard/site/branches/live/docs/bundles.html Wed Nov  3 12:38:02 2010
@@ -212,7 +212,7 @@ limitations under the License.
   </p>
                                 <ul>
       <li>
-        <a href="#eclipse-harmony">In Harmony with Eclipse</a>
+        <a href="#eclipse-harmony">In Harmony with Eclipse™</a>
       </li>
       <li>
         <a href="#Tomcat">Apache Tomcat</a>

Modified: harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html Wed Nov  3 12:38:02
2010
@@ -36,7 +36,7 @@ limitations under the License.
             
             
             
-            <title>Apache Harmony - Apache Harmony Development Using Eclipse</title>
+            <title>Apache Harmony - Apache Harmony Development Using Eclipse™</title>
 
                         
                         
@@ -256,7 +256,7 @@ limitations under the License.
       
                         <p>
         Next you will need the code to work with. <i>For class library development</i>,
-        you will need a compatible VM, such as DRLVM or IBM virtual machine (the latter
+        you will need a compatible VM, such as DRLVM or IBM® virtual machine (the latter
         available under a non-open source, binary evaluation license). Install the VM following
the 
         instructions that accompany that VM in the same location as the class libraries build
(or the
         location you will be building to if you are building the class libraries yourself).

Modified: harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/eclipse_update.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/eclipse_update.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/eclipse_update.html Wed Nov  3
12:38:02 2010
@@ -36,7 +36,7 @@ limitations under the License.
             
             
             
-            <title>Apache Harmony - Apache Harmony Eclipse Plug-in</title>
+            <title>Apache Harmony - Apache Harmony Eclipse™ Plug-in</title>
 
                         
                         

Modified: harmony/standard/site/branches/live/docs/download.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/download.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/download.html (original)
+++ harmony/standard/site/branches/live/docs/download.html Wed Nov  3 12:38:02 2010
@@ -206,9 +206,21 @@ limitations under the License.
       <a name="Project Downloads">Project Downloads</a>
     </h1>
                         <p>
-    Apache Harmony's primary goal is a complete Java SE implementation, including
-    virtual machine, class library areas, and all related and common tooling.
-  </p>
+        Apache Harmony is the Java SE project of the
+        <a href="http://www.apache.org/">Apache Software Foundation</a>.
+        The aim of the project is to produce a large and healthy community
+        of those interested in runtime platforms tasked with creation of:
+      </p>
+                                <ul>
+        <li>
+          A compatible, independent implementation of the Java SE 5 and 6
+          JDKs under the Apache License v2
+        </li>
+        <li>
+          A community-developed modular runtime (VM and class library)
+          architecture.
+        </li>
+      </ul>
                                 <p>
     Access to <a href="svn.html">the code repository</a> is available to all.

     For information on how to get configured to build and work with the Apache Harmony
@@ -286,7 +298,7 @@ limitations under the License.
         </ul>
       </li>
       <li>
-        <a href="documentation/eclipse_update.html">Eclipse plug-in for Apache Harmony
VM</a>
+        <a href="documentation/eclipse_update.html">Eclipse™ plug-in for Apache
Harmony VM</a>
       </li>
     </ul>
   </p>

Modified: harmony/standard/site/branches/live/docs/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/index.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/index.html (original)
+++ harmony/standard/site/branches/live/docs/index.html Wed Nov  3 12:38:02 2010
@@ -210,20 +210,15 @@ limitations under the License.
         <big>Welcome to Apache Harmony - Open Source Java SE.</big>
       </p>
                                 <p>
-        Apache Harmony is
-        the Java SE project of the
+        Apache Harmony is the Java SE project of the
         <a href="http://www.apache.org/">Apache Software Foundation</a>.
-        Please help us make this a world class, certified implementation of the
-        Java Platform Standard Edition!
-      </p>
-                                <p>
         The aim of the project is to produce a large and healthy community
         of those interested in runtime platforms tasked with creation of:
       </p>
                                 <ul>
         <li>
-          A compatible, independent implementation of the Java SE 5
-          JDK under the Apache License v2
+          A compatible, independent implementation of the Java SE 5 and 6
+          JDKs under the Apache License v2
         </li>
         <li>
           A community-developed modular runtime (VM and class library)
@@ -388,7 +383,7 @@ limitations under the License.
           Regular milestone builds.
         </li>
         <li>
-          JRE can run popular programs like Apache Tomcat, Eclipse, Maven, Derby, Ant
+          JRE can run popular programs like Apache Tomcat, Eclipse™, Apache Maven, Apache
Derby, Apache Ant
         </li>
         <li>
           More than

Modified: harmony/standard/site/branches/live/docs/index.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/index.ru.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/index.ru.html (original)
+++ harmony/standard/site/branches/live/docs/index.ru.html Wed Nov  3 12:38:02 2010
@@ -203,7 +203,7 @@ limitations under the License.
             <!-- MAIN CONTENT -->
             <div id="top">
                                                         <h1>
-      <a name="Добро пожаловать в проект
Apache Harmony!">Добро пожаловать в проект
Apache Harmony!</a>
+      <a name="Добро пожаловать в проект
Apache Harmony™!">Добро пожаловать в
проект Apache Harmony™!</a>
     </h1>
                         <p style="text-align: right">RU | <a href="index.html">EN</a></p>
                                 <P><strong>Внимание</strong>:
Данная страница является
переводом английской 
@@ -300,7 +300,7 @@ limitations under the License.
         на всех поддерживаемых
платформах</li>
         <li>
           В нашей реализации среды
исполнения JRE успешно работают
такие популярные приложения
как
-          Apache Tomcat, Eclipse, Maven, Derby, и Ant
+          Apache Tomcat, Eclipse™, Apache Maven, Apache Derby, и Apache Ant
         </li>
         <li>Реализовано более 99% интерфейса
 Java 5 (завершено но не сертифицировано
на совместимость)
     </li>

Modified: harmony/standard/site/branches/live/docs/newshistory.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/newshistory.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/newshistory.html (original)
+++ harmony/standard/site/branches/live/docs/newshistory.html Wed Nov  3 12:38:02 2010
@@ -521,7 +521,7 @@ limitations under the License.
                 <dd> Our <a href="download.cgi">latest snapshots</a> have
                         lots of new fixes and features. The VM has a new GC,
                         almost complete JVMTI, and now can co-exist with
-                        <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the
IBM VME</a> in
+                        <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the
IBM® VME</a> in
                         the Harmony JRE structure. Our classlibrary continues to grow with
new
                         classes, notably CORBA, thanks to <a href="http://incubator.apache.org/yoko">
                         Apache Yoko</a>.

Modified: harmony/standard/site/branches/live/docs/newshistory.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/newshistory.ru.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/newshistory.ru.html (original)
+++ harmony/standard/site/branches/live/docs/newshistory.ru.html Wed Nov  3 12:38:02 2010
@@ -477,7 +477,7 @@ limitations under the License.
       <dt>Доступны новые сборки
кода</dt>
       <dd> В <a href="download.cgi">новые сборки
кода</a> вошел целый ряд исправлений
и добавлений, 
       включая новый коллектор
и практически полную реализацию
интерфейса JVMTI. Кроме того, 
-      виртуальная машина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM
VME</a> 
+      виртуальная машина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM®
VME</a> 
       теперь может функционировать
в структуре среды исполнения
JRE. Набор библиотек продолжает
       пополняться новыми классами,
в том числе CORBA, за что мы благодарим
проект<a href="http://incubator.apache.org/yoko">
       Apache Yoko</a>. В этой версии сборки
выполнено множество исправлений
и поправок

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.html Wed Nov  3 12:38:02
2010
@@ -274,7 +274,7 @@ limitations under the License.
         the version of the tool you use. For example, edit <code>~/.subversion/servers</code>
         file for console version of <code>svn</code>.
       </p>
-                                <p>Optional (but recommended) prerequisite is an Eclipse
Java Compiler (ECJ), version 3.2 or higher. 
+                                <p>Optional (but recommended) prerequisite is an Eclipse™
Java Compiler (ECJ), version 3.2 or higher. 
       You need to <a href="http://download.eclipse.org/eclipse/downloads/">download</a>

       standalone ecj.jar and put it to <code>ANT_HOME/lib</code> directory.
       Alternatively, you can switch to any other Java 1.5 compiler supported by Ant
@@ -580,7 +580,7 @@ $ ant</pre>
           <b>Class library developers</b> can work with DRLVM or install
           another compatible VM. For example, you can use the
           <a href="http://www.ibm.com/developerworks/java/jdk/harmony/index.html">
-            IBM virtual machine
+            IBM® virtual machine
           </a> that has been generously made available for the project's
           development needs by IBM under a non-open source, binary evaluation license.
           To install the VM, follow the instructions that accompany that VM.

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html (original)
+++ harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html Wed Nov  3 12:38:02
2010
@@ -250,7 +250,7 @@ limitations under the License.
 -Dhttp.proxyPort=&lt;proxy&gt;</pre>
         </li>
         </ul>
-                                <p>Необязательным
(но рекомендкемым) ПО является
Eclipse Java Compiler (ECJ), 
+                                <p>Необязательным
(но рекомендкемым) ПО является
Eclipse™ Java Compiler (ECJ), 
       версия 3.2 или более поздняя.

       Вы можете <a href="http://download.eclipse.org/eclipse/downloads/">скачать</a>

       ecj.jar как отдельный файл и поместить
его в папку <code>ANT_HOME/lib</code>.
@@ -458,7 +458,7 @@ $ ant</pre>
       
                         <a id="assemble-jdk" />
                                 <p>Разработчики
библиотек классов могут использовать
виртуальную машину DRLVM
-    или установить другую совместимую
ВМ. Например, вы можете использовать
IBM
+    или установить другую совместимую
ВМ. Например, вы можете использовать
IBM®
     virtual machine которая была предоставлена
компанией IBM для нужд разработчиков
      проекта на условиях пробной,
не открытой лицензии на выполняемый
код.
      Для установки ВМ следуйте
прилагающейся документации.
Вы можете развернуть

Modified: harmony/standard/site/branches/live/docs/related.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/related.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/related.html (original)
+++ harmony/standard/site/branches/live/docs/related.html Wed Nov  3 12:38:02 2010
@@ -210,12 +210,7 @@ limitations under the License.
    machines that work with the Apache Harmony class library:
    </p>
                                 <ul>
-   <li><a href="http://www.ibm.com/developerworks/java/jdk/harmony/">IBM J9</a>:
IBM has
-   made their production-grade virtual machine available for project use under
-   a non-open source, evaluation binary license. This VM works with the Harmony
-   class library.
-   </li>
-   <li><a href="http://dev2dev.bea.com/jrockit/jrockitVM/">BEA JRockit</a>:
BEA has
+   <li><a href="http://www.ibm.com/developerworks/java/jdk/harmony/">IBM®
J9</a>: IBM has
    made their production-grade virtual machine available for project use under
    a non-open source, evaluation binary license. This VM works with the Harmony
    class library.

Modified: harmony/standard/site/branches/live/docs/sitemap.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/sitemap.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/sitemap.html (original)
+++ harmony/standard/site/branches/live/docs/sitemap.html Wed Nov  3 12:38:02 2010
@@ -385,7 +385,7 @@ limitations under the License.
 
             <p>
               <a href="documentation/dev_eclipse.html">
-                Getting Started with Eclipse</a>
+                Getting Started with Eclipse™</a>
               to develop Java code in Apache Harmony, featuring
               <a href="documentation/dev_eclipse_movie.html">
                 a

Modified: harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html Wed Nov
 3 12:38:02 2010
@@ -234,7 +234,7 @@ limitations under the License.
     </li>
     
       <li>
-            <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse
IDE</a>
+            <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse™
IDE</a>
             <br />
                 Describes how to set up Eclipse to develop the class library code.
 

Modified: harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html Wed
Nov  3 12:38:02 2010
@@ -209,7 +209,7 @@ limitations under the License.
                 <small>
                     <em>
                         This section is inspired by, and derived from,
-                        <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the
Eclipse package naming convention</a>
+                        <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the
Eclipse™ package naming convention</a>
                         documentation.
                     </em>
                 </small>

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html (original)
+++ harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html Wed Nov  3 12:38:02
2010
@@ -241,7 +241,7 @@ limitations under the License.
                 Getting Started with DRLVM
               </a>
               <br />
-              Basic usage scenarios of VM: starting an application, working in Eclipse
+              Basic usage scenarios of VM: starting an application, working in Eclipse™
             </li>
             <li> <a href="debugging_VM_and_JIT.html">Debugging VM and JIT</a>
               <br />

Modified: harmony/standard/site/branches/live/xdocs/bundles.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/bundles.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/bundles.xml (original)
+++ harmony/standard/site/branches/live/xdocs/bundles.xml Wed Nov  3 12:38:02 2010
@@ -34,7 +34,7 @@
   </p>
     <ul>
       <li>
-        <a href="#eclipse-harmony">In Harmony with Eclipse</a>
+        <a href="#eclipse-harmony">In Harmony with Eclipse&#8482;</a>
       </li>
       <li>
         <a href="#Tomcat">Apache Tomcat</a>

Modified: harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/dev_eclipse.xml Wed Nov  3 12:38:02
2010
@@ -21,7 +21,7 @@
 <document>
 
  <properties>
-  <title>Apache Harmony Development Using Eclipse</title>
+  <title>Apache Harmony Development Using Eclipse&#8482;</title>
   <author email="dev@harmony.apache.org">Harmony Documentation Team</author>
  </properties>
 
@@ -72,7 +72,7 @@
     <subsection name="Getting the Code">
       <p>
         Next you will need the code to work with. <i>For class library development</i>,
-        you will need a compatible VM, such as DRLVM or IBM virtual machine (the latter
+        you will need a compatible VM, such as DRLVM or IBM&#174; virtual machine (the
latter
         available under a non-open source, binary evaluation license). Install the VM following
the 
         instructions that accompany that VM in the same location as the class libraries build
(or the
         location you will be building to if you are building the class libraries yourself).

Modified: harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml (original)
+++ harmony/standard/site/branches/live/xdocs/documentation/eclipse_update.xml Wed Nov  3
12:38:02 2010
@@ -21,7 +21,7 @@
 <document>
 
  <properties>
-  <title>Apache Harmony Eclipse Plug-in</title>
+  <title>Apache Harmony Eclipse&#8482; Plug-in</title>
   <author email="dev@harmony.apache.org">Harmony Documentation Team</author>
  </properties>
 

Modified: harmony/standard/site/branches/live/xdocs/download.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/download.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/download.xml (original)
+++ harmony/standard/site/branches/live/xdocs/download.xml Wed Nov  3 12:38:02 2010
@@ -27,10 +27,22 @@
   <body>
 
 <section name="Project Downloads">
-  <p>
-    Apache Harmony's primary goal is a complete Java SE implementation, including
-    virtual machine, class library areas, and all related and common tooling.
-  </p>
+ <p>
+        Apache Harmony is the Java SE project of the
+        <a href="http://www.apache.org/">Apache Software Foundation</a>.
+        The aim of the project is to produce a large and healthy community
+        of those interested in runtime platforms tasked with creation of:
+      </p>
+      <ul>
+        <li>
+          A compatible, independent implementation of the Java SE 5 and 6
+          JDKs under the Apache License v2
+        </li>
+        <li>
+          A community-developed modular runtime (VM and class library)
+          architecture.
+        </li>
+      </ul>
   <p>
     Access to <a href="svn.html">the code repository</a> is available to all.

     For information on how to get configured to build and work with the Apache Harmony
@@ -114,7 +126,7 @@
         </ul>
       </li>
       <li>
-        <a href="documentation/eclipse_update.html">Eclipse plug-in for Apache Harmony
VM</a>
+        <a href="documentation/eclipse_update.html">Eclipse&#8482; plug-in for
Apache Harmony VM</a>
       </li>
     </ul>
   </p>

Modified: harmony/standard/site/branches/live/xdocs/index.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/index.ru.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/index.ru.xml (original)
+++ harmony/standard/site/branches/live/xdocs/index.ru.xml Wed Nov  3 12:38:02 2010
@@ -26,7 +26,7 @@
 
   <body>
 
-    <section name="Добро пожаловать в
проект Apache Harmony!">
+    <section name="Добро пожаловать в
проект Apache Harmony&#8482;!">
     <p style="text-align: right">RU | <a href="index.html">EN</a></p>
     <P><strong>Внимание</strong>: Данная
страница является переводом
английской 
     версии на сайте и находится
в стадии разработки.</P>
@@ -121,7 +121,7 @@
         на всех поддерживаемых
платформах</li>
         <li>
           В нашей реализации среды
исполнения JRE успешно работают
такие популярные приложения
как
-          Apache Tomcat, Eclipse, Maven, Derby, и Ant
+          Apache Tomcat, Eclipse&#8482;, Apache Maven, Apache Derby, и Apache Ant
         </li>
         <li>Реализовано более 99% интерфейса
 Java 5 (завершено но не сертифицировано
на совместимость)
     </li>

Modified: harmony/standard/site/branches/live/xdocs/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/index.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/index.xml (original)
+++ harmony/standard/site/branches/live/xdocs/index.xml Wed Nov  3 12:38:02 2010
@@ -33,20 +33,15 @@
       </p>
 
       <p>
-        Apache Harmony is
-        the Java SE project of the
+        Apache Harmony is the Java SE project of the
         <a href="http://www.apache.org/">Apache Software Foundation</a>.
-        Please help us make this a world class, certified implementation of the
-        Java Platform Standard Edition!
-      </p>
-      <p>
         The aim of the project is to produce a large and healthy community
         of those interested in runtime platforms tasked with creation of:
       </p>
       <ul>
         <li>
-          A compatible, independent implementation of the Java SE 5
-          JDK under the Apache License v2
+          A compatible, independent implementation of the Java SE 5 and 6
+          JDKs under the Apache License v2
         </li>
         <li>
           A community-developed modular runtime (VM and class library)
@@ -209,7 +204,7 @@
           Regular milestone builds.
         </li>
         <li>
-          JRE can run popular programs like Apache Tomcat, Eclipse, Maven, Derby, Ant
+          JRE can run popular programs like Apache Tomcat, Eclipse&#8482;, Apache Maven,
Apache Derby, Apache Ant
         </li>
         <li>
           More than

Modified: harmony/standard/site/branches/live/xdocs/newshistory.ru.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/newshistory.ru.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/newshistory.ru.xml (original)
+++ harmony/standard/site/branches/live/xdocs/newshistory.ru.xml Wed Nov  3 12:38:02 2010
@@ -296,7 +296,7 @@
       <dt>Доступны новые сборки
кода</dt>
       <dd> В <a href="download.cgi">новые сборки
кода</a> вошел целый ряд исправлений
и добавлений, 
       включая новый коллектор
и практически полную реализацию
интерфейса JVMTI. Кроме того, 
-      виртуальная машина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM
VME</a> 
+      виртуальная машина <a href="http://www.ibm.com/developerworks/java/jdk/harmony">IBM&#174;
VME</a> 
       теперь может функционировать
в структуре среды исполнения
JRE. Набор библиотек продолжает
       пополняться новыми классами,
в том числе CORBA, за что мы благодарим
проект<a href="http://incubator.apache.org/yoko">
       Apache Yoko</a>. В этой версии сборки
выполнено множество исправлений
и поправок

Modified: harmony/standard/site/branches/live/xdocs/newshistory.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/newshistory.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/newshistory.xml (original)
+++ harmony/standard/site/branches/live/xdocs/newshistory.xml Wed Nov  3 12:38:02 2010
@@ -340,7 +340,7 @@
                 <dd> Our <a href="download.cgi">latest snapshots</a> have
                         lots of new fixes and features. The VM has a new GC,
                         almost complete JVMTI, and now can co-exist with
-                        <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the
IBM VME</a> in
+                        <a href="http://www.ibm.com/developerworks/java/jdk/harmony">the
IBM&#174; VME</a> in
                         the Harmony JRE structure. Our classlibrary continues to grow with
new
                         classes, notably CORBA, thanks to <a href="http://incubator.apache.org/yoko">
                         Apache Yoko</a>.

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.ru.xml Wed Nov  3 12:38:02
2010
@@ -71,7 +71,7 @@
 -Dhttp.proxyPort=&lt;proxy&gt;</pre>
         </li>
         </ul>
-      <p>Необязательным (но рекомендкемым)
ПО является Eclipse Java Compiler (ECJ), 
+      <p>Необязательным (но рекомендкемым)
ПО является Eclipse&#8482; Java Compiler (ECJ), 
       версия 3.2 или более поздняя.

       Вы можете <a href="http://download.eclipse.org/eclipse/downloads/">скачать</a>

       ecj.jar как отдельный файл и поместить
его в папку <code>ANT_HOME/lib</code>.
@@ -272,7 +272,7 @@ $ ant</pre>
 <subsection name="3. Конструирование среды
исполнения из скомпилированных
компонент">
 <a id="assemble-jdk"/>
     <p>Разработчики библиотек
классов могут использовать
виртуальную машину DRLVM
-    или установить другую совместимую
ВМ. Например, вы можете использовать
IBM
+    или установить другую совместимую
ВМ. Например, вы можете использовать
IBM&#174;
     virtual machine которая была предоставлена
компанией IBM для нужд разработчиков
      проекта на условиях пробной,
не открытой лицензии на выполняемый
код.
      Для установки ВМ следуйте
прилагающейся документации.
Вы можете развернуть

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml (original)
+++ harmony/standard/site/branches/live/xdocs/quickhelp_contributors.xml Wed Nov  3 12:38:02
2010
@@ -95,7 +95,7 @@
         the version of the tool you use. For example, edit <code>~/.subversion/servers</code>
         file for console version of <code>svn</code>.
       </p>
-      <p>Optional (but recommended) prerequisite is an Eclipse Java Compiler (ECJ),
version 3.2 or higher. 
+      <p>Optional (but recommended) prerequisite is an Eclipse&#8482; Java Compiler
(ECJ), version 3.2 or higher. 
       You need to <a href="http://download.eclipse.org/eclipse/downloads/">download</a>

       standalone ecj.jar and put it to <code>ANT_HOME/lib</code> directory.
       Alternatively, you can switch to any other Java 1.5 compiler supported by Ant
@@ -378,7 +378,7 @@ $ ant</source>
           <b>Class library developers</b> can work with DRLVM or install
           another compatible VM. For example, you can use the
           <a href="http://www.ibm.com/developerworks/java/jdk/harmony/index.html">
-            IBM virtual machine
+            IBM&#174; virtual machine
           </a> that has been generously made available for the project's
           development needs by IBM under a non-open source, binary evaluation license.
           To install the VM, follow the instructions that accompany that VM.

Modified: harmony/standard/site/branches/live/xdocs/related.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/related.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/related.xml (original)
+++ harmony/standard/site/branches/live/xdocs/related.xml Wed Nov  3 12:38:02 2010
@@ -33,12 +33,7 @@
    </p>
    
    <ul>
-   <li><a href="http://www.ibm.com/developerworks/java/jdk/harmony/">IBM J9</a>:
IBM has
-   made their production-grade virtual machine available for project use under
-   a non-open source, evaluation binary license. This VM works with the Harmony
-   class library.
-   </li>
-   <li><a href="http://dev2dev.bea.com/jrockit/jrockitVM/">BEA JRockit</a>:
BEA has
+   <li><a href="http://www.ibm.com/developerworks/java/jdk/harmony/">IBM&#174;
J9</a>: IBM has
    made their production-grade virtual machine available for project use under
    a non-open source, evaluation binary license. This VM works with the Harmony
    class library.

Modified: harmony/standard/site/branches/live/xdocs/sitemap.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/sitemap.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/sitemap.xml (original)
+++ harmony/standard/site/branches/live/xdocs/sitemap.xml Wed Nov  3 12:38:02 2010
@@ -197,7 +197,7 @@ limitations under the License.
 
             <p>
               <a href="documentation/dev_eclipse.html">
-                Getting Started with Eclipse</a>
+                Getting Started with Eclipse&#8482;</a>
               to develop Java code in Apache Harmony, featuring
               <a href="documentation/dev_eclipse_movie.html">
                 a

Modified: harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/index.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/index.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/index.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/index.xml Wed Nov
 3 12:38:02 2010
@@ -53,7 +53,7 @@
     </li>
     
       <li>
-            <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse
IDE</a>
+            <a href="../../documentation/dev_eclipse.html"> Development with the Eclipse&#8482;
IDE</a>
             <br />
                 Describes how to set up Eclipse to develop the class library code.
 

Modified: harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/pkgnaming.xml
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/pkgnaming.xml?rev=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/pkgnaming.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/classlibrary/pkgnaming.xml Wed
Nov  3 12:38:02 2010
@@ -31,7 +31,7 @@
                 <small>
                     <em>
                         This section is inspired by, and derived from,
-                        <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the
Eclipse package naming convention</a>
+                        <a href="http://wiki.eclipse.org/index.php/Naming_Conventions">the
Eclipse&#8482; package naming convention</a>
                         documentation.
                     </em>
                 </small>

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=1030436&r1=1030435&r2=1030436&view=diff
==============================================================================
--- harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml (original)
+++ harmony/standard/site/branches/live/xdocs/subcomponents/drlvm/index.xml Wed Nov  3 12:38:02
2010
@@ -60,7 +60,7 @@
                 Getting Started with DRLVM
               </a>
               <br />
-              Basic usage scenarios of VM: starting an application, working in Eclipse
+              Basic usage scenarios of VM: starting an application, working in Eclipse&#8482;
             </li>
             <li> <a href="debugging_VM_and_JIT.html">Debugging VM and JIT</a>
               <br />



Mime
View raw message