Author: veithen
Date: Sat May 14 10:38:19 2011
New Revision: 1103014
URL: http://svn.apache.org/viewvc?rev=1103014&view=rev
Log:
AXIS2-5041: Merged r1103013 to the 1.6 branch so that the site change will be
published with the 1.6.0 release.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/eclipse/plugin-installation.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 10:38:19 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013
Modified:
axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/eclipse/plugin-installation.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/eclipse/plugin-installation.xml?rev=1103014&r1=1103013&r2=1103014&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/eclipse/plugin-installation.xml
(original)
+++
axis/axis2/java/core/branches/1_6/src/site/xdoc/tools/eclipse/plugin-installation.xml
Sat May 14 10:38:19 2011
@@ -31,6 +31,9 @@
(<a href="servicearchiver-plugin.html">Service Archive
Generator</a> and
<a href="wsdl2java-plugin.html">Code Generator Wizard</a>).
The two plugins should work on Eclipse version 3.1 and
upwards, and require at least Java 1.5.
+ The plugins have dependencies on bundles that are installed by
default in the Eclipse IDE for Java EE Developers
+ edition, but not in the Eclipse IDE for Java Developers
edition. It is therefore recommended
+ to use the EE edition.
The installation procedure is the same for both plugins, but
depends on the Eclipse
version being used. To determine which procedure to use, check
if there is a
<tt>dropins</tt> folder in the Eclipse installation directory.
This folder is used
