Merge remote-tracking branch 'gsoc-2011/master'

Conflicts: features/org.xwiki.eclipse.feature/feature.xml plugins/org.xwiki.eclipse.core/META-INF/MANIFEST.MF plugins/org.xwiki.eclipse.ui/META-INF/MANIFEST.MF plugins/org.xwiki.eclipse.xmlrpc/pom.xml pom.xml
xwiki-contrib · Oct 3, 2011 · f0374a4 · f0374a4
2 parents 68224db + 2e7ca72
commit f0374a4
Show file tree

Hide file tree

Showing 228 changed files with 16,048 additions and 3,251 deletions.
diff --git a/README b/README
@@ -4,42 +4,32 @@ See http://mojo.codehaus.org/pde-maven-plugin/usage.html for more details.
 XEclipse is made of the following plugins and features:
  * org.xwiki.eclipse.core
  * org.xwiki.eclipse.ui
+ * org.xwiki.eclipse.storage
+ * org.xwiki.eclipse.rest
  * org.xwiki.eclipse.xmlrpc
+ * org.xwiki.eclipse.rcp
  * org.xwiki.eclipse.feature
 
-To build XEclipse you have 2 options:
+To build XEclipse you have 4 options:
  * Build the Eclipse plugin.
  * Build a standalone RCP application.
+ * Build a update site
+ * Build a p2 repository
 
-Building the Eclipse plugin
+Building XEclipse
 ===========================
 
-1) Checkout the trunk: "svn co http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk/"
-2) cd to trunk/features/org.xwiki.eclipse.feature.
-3) Do a "mvn -DeclipseInstall=/AbsolutePath/To/Your/Eclipse/Installation" compile.
-4) You should now have a org.xwiki.eclipse.feature_1.2.0.SNAPSHOT.bin.dist.zip file in this directory.
-
-In order to install:
-
-1) Unzip org.xwiki.eclipse.feature_1.2.0.SNAPSHOT.bin.dist.zip into your Eclipse directory.
-2) Run Eclipse.
-2.1) If XWiki Eclipse doesn't show up anywhere (for example when you open the Window->Show view->Other... dialog)
-     then you might need to re-run Eclipse by specifying the -clean switch on the command line.
-
-You can start using XWiki Eclipse by creating a connection using the File->New->Other... menu command.
-XWiki connections will be accessible from the Project Explorer and XWiki Navigator.
-
-Building the RCP application
-============================
-
-Please refer to:
-http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse.rcp/README
+0) Install Maven 3.0.3+ and JDK 6.0.
+1) Checkout the master branch: https://github.com/junhan/xwiki-eclipse.
+2) cd to xwiki-eclipse/.
+3) Do a "mvn clean install".
+4) Standalone RCP applications (or products) are in product/target.
+5) An update site is in site/target.
+6) A P2 repository is in repository/target.
+7) A feature is in features/org.xwiki.eclipse.feature/target.
 
 Troubleshooting
 ===============
-
-In case of a Linux installation, the Web preview requires that XEclipse is launched with the following environment variables:
-* MOZILLA_FIVE_HOME pointing to the directory containing a Firefox executable (ex: /usr/lib/firefox-2.0.0.6/)
-* LD_LIBRARY_PATH pointing to the directory containing Firefox libraries (ex: /usr/lib/firefox-2.0.0.6/)
+Generation of MAC OS X product from Linux OS is supported from Tycho 0.13.0+.
 
 Enjoy.
diff --git a/features/org.xwiki.eclipse.feature/feature.xml b/features/org.xwiki.eclipse.feature/feature.xml
@@ -48,23 +48,25 @@ if not, write to the Free Software Foundation, Inc.,
    </license>
 
    <requires>
-      <import plugin="org.xwiki.eclipse.xmlrpc" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.6.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.200" match="greaterOrEqual"/>
+      <import plugin="org.xwiki.eclipse.xmlrpc" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.xwiki.eclipse.storage" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.6.2" match="greaterOrEqual"/>
-      <import plugin="org.xwiki.eclipse.core" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.6.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views" version="3.5.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.6.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.6.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.202" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.forms" version="3.5.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface.text" version="3.6.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.compare" version="3.5.101" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views" version="3.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.6.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.202" match="greaterOrEqual"/>
+      <import plugin="org.xwiki.eclipse.core" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.log" version="1.0.100" match="greaterOrEqual"/>
       <import plugin="org.xwiki.eclipse.ui" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.swt" version="3.0.0" match="compatible"/>
+      <import plugin="org.xwiki.eclipse.rest" version="1.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -85,7 +87,8 @@ if not, write to the Free Software Foundation, Inc.,
          id="org.xwiki.eclipse.xmlrpc"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.xwiki.eclipse.rcp"
@@ -94,6 +97,42 @@ if not, write to the Free Software Foundation, Inc.,
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.xwiki.eclipse.storage"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.xwiki.eclipse.rest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.cocoa.macosx"
+         os="macosx"
+         ws="cocoa"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.cocoa.macosx.x86_64"
+         os="macosx"
+         ws="cocoa"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.swt.gtk.linux.x86"
          os="linux"
@@ -137,27 +176,12 @@ if not, write to the Free Software Foundation, Inc.,
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-<!--
-   <plugin
-         id="org.eclipse.swt.cocoa.macosx.x86_64"
-         os="macosx"
-         ws="cocoa"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.cocoa.macosx"
-         os="macosx"
-         ws="cocoa"
-         arch="x86"
+         id="org.eclipse.swt"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
--->
+
 </feature>
diff --git a/plugins/org.xwiki.eclipse.core/.classpath b/plugins/org.xwiki.eclipse.core/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.xwiki.eclipse.core/META-INF/MANIFEST.MF b/plugins/org.xwiki.eclipse.core/META-INF/MANIFEST.MF
@@ -5,14 +5,12 @@ Bundle-SymbolicName: org.xwiki.eclipse.core;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.xwiki.eclipse.core.CorePlugin
 Bundle-Vendor: XWiki
-Require-Bundle: org.xwiki.eclipse.xmlrpc;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.6.1",
- org.eclipse.core.expressions;bundle-version="3.4.200"
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.xwiki.eclipse.storage;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
 Export-Package: org.xwiki.eclipse.core,
- org.xwiki.eclipse.core.model,
- org.xwiki.eclipse.core.notifications,
- org.xwiki.eclipse.core.utils
-Bundle-ClassPath: lib/xstream-1.3.jar,.
+ org.xwiki.eclipse.core.expressions
+Bundle-ClassPath: .
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.xwiki.eclipse.core/build.properties b/plugins/org.xwiki.eclipse.core/build.properties
@@ -2,5 +2,4 @@ source.. = src/main/java/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               lib/xstream-1.3.jar
+               plugin.xml
diff --git a/plugins/org.xwiki.eclipse.core/lib/xstream-1.3.jar b/plugins/org.xwiki.eclipse.core/lib/xstream-1.3.jar
diff --git a/plugins/org.xwiki.eclipse.core/plugin.xml b/plugins/org.xwiki.eclipse.core/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
+<?eclipse version="3.4"?>
 <plugin>
 	<extension id="org.xwiki.eclipse.XWikiEclipseNature" name="XWiki Eclipse Nature" point="org.eclipse.core.resources.natures">
 		<runtime>
@@ -8,7 +8,7 @@
 		</runtime>
 	</extension>
 	<extension point="org.eclipse.core.expressions.propertyTesters">
-		<propertyTester class="org.xwiki.eclipse.core.expressions.DataManagerPropertyTester" id="org.xwiki.eclipse.core.DataManagerTester" namespace="org.xwiki.eclipse.core.DataManager" properties="isConnected" type="org.xwiki.eclipse.core.DataManager">
+		<propertyTester class="org.xwiki.eclipse.core.expressions.DataManagerPropertyTester" id="org.xwiki.eclipse.core.DataManagerTester" namespace="org.xwiki.eclipse.storage.DataManager" properties="isConnected" type="org.xwiki.eclipse.storage.DataManager">
       </propertyTester>
 	</extension>
 </plugin>
diff --git a/plugins/org.xwiki.eclipse.core/src/main/java/org/xwiki/eclipse/core/CoreLog.java b/plugins/org.xwiki.eclipse.core/src/main/java/org/xwiki/eclipse/core/CoreLog.java
@@ -23,6 +23,10 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
+/**
+ * 
+ * @version $Id$
+ */
 public class CoreLog
 {
     public static void logInfo(String message)

diff --git a/plugins/org.xwiki.eclipse.core/src/main/java/org/xwiki/eclipse/core/CorePlugin.java b/plugins/org.xwiki.eclipse.core/src/main/java/org/xwiki/eclipse/core/CorePlugin.java
@@ -35,6 +35,8 @@
 
 /**
  * The activator class controls the plug-in life cycle
+ * 
+ * @version $Id$
  */
 public class CorePlugin extends Plugin
 {