Merge lp:~verterok/bzr-eclipse/builds-with-tycho into lp:~verterok/bzr-eclipse/trunk

[Guillermo Gonzalez]

This branch adds a "site" project and changes all the pom.xml and fix some issues with the tests in order to make use of tycho to run tests and build the update-site.

[Guillermo Gonzalez (verterok)]

Hi Geoff,

I requested a review for this, as it changes the dependencies :)
(Let me know if you can't review it)

In order to test it you need to get maven 3.0.x, and run: mvn-3 clean compile integration-test
That should build it and run the unittests in org.vcs.bazaar.eclipse.core.tests.

Cheers,

[Guillermo Gonzalez (verterok)]

And if you want to check the result of the new build, here is the update site generate by tycho: http://verterok.com.ar/bzr-eclipse/tycho-update-site/

[xaav (xaav)]

Sorry, I was gone the past few weeks. I'll look into this as soon as I have the time!

=== modified file '.bzrignore'
--- .bzrignore	2009-05-04 05:13:16 +0000
+++ .bzrignore	2011-07-20 00:07:30 +0000
@@ -9,3 +9,13 @@
 *.jar
 org.vcs.bazaar.eclipse.core.tests/bin
 org.vcs.bazaar.eclipse.client/plugins/*
+org.apache.commons.logging/target
+org.kxml2/target
+org.vcs.bazaar.eclipse.client/target
+org.vcs.bazaar.eclipse.core/target
+org.vcs.bazaar.eclipse.core.tests/target
+org.vcs.bazaar.eclipse.feature/target
+org.vcs.bazaar.eclipse.site/target
+org.vcs.bazaar.eclipse.tests-feature/target
+org.vcs.bazaar.eclipse.ui/target
+redstone.xmlrpc/target

=== modified file 'HowToCompileAndRun.txt'
--- HowToCompileAndRun.txt	2009-09-20 06:59:46 +0000
+++ HowToCompileAndRun.txt	2011-07-20 00:07:30 +0000
@@ -1,9 +1,9 @@
 Requirements:
  * Eclipse SDK >= 3.3 (get it [http://eclipse.org/downloads here])
  * Java 1.5 (5.0) but should run with 1.6 (get it [http://java.sun.com/javase/downloads/index.jsp here])
- * bzr-xmloutput >= 0.8.5
- * bazaar >= 1.18 recommended
- * maven (2.2.0 recommended)
+ * bzr-xmloutput >= 0.8.7
+ * bazaar >= 2.x recommended
+ * maven 3.0.x (a.k.a tycho)
  
 Recomended:
  * ~1 GB of RAM, to comfortably run in debug mode or directly from the source (more on this later)
@@ -11,7 +11,7 @@
 1) Get the source code from https://launchpad.net/bzr-eclipse 
   bzr branch lp:bzr-eclipse
 
- 1.1) run: mvn compile to get bzr-java-lib and it dependencies in place
+ 1.1) run: 'mvn compile integration-tests' to get bzr-java-lib and it dependencies in place and run the tests.
 
 2) Launch Eclipse
  2.1) File--> Import --> "Existing project into workspace"

=== modified file 'INSTALL'
--- INSTALL	2009-09-20 06:59:46 +0000
+++ INSTALL	2011-07-20 00:07:30 +0000
@@ -10,7 +10,7 @@
 
 Dependencies
 ------------
- * bazaar >= 1.18 recommended
+ * bazaar >= 2.x recommended
  * Java SDK/JRE >=1.5
  * Eclipse >= 3.3
 

=== modified file 'org.apache.commons.logging/pom.xml'
--- org.apache.commons.logging/pom.xml	2009-09-05 15:06:07 +0000
+++ org.apache.commons.logging/pom.xml	2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bzr-eclipse</artifactId>
     <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
     <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.commons.logging</groupId>
   <artifactId>org.apache.commons.logging</artifactId>
   <version>1.1.1</version>
-  <packaging>pom</packaging>
+  <packaging>eclipse-plugin</packaging>
   <dependencies>  	
     <dependency>
 	  <groupId>commons-logging</groupId>

=== modified file 'org.kxml2/pom.xml'
--- org.kxml2/pom.xml	2009-09-05 15:06:07 +0000
+++ org.kxml2/pom.xml	2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bzr-eclipse</artifactId>
     <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
     <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.kxml2</groupId>
   <artifactId>org.kxml2</artifactId>
   <version>2.3.0</version>
-  <packaging>pom</packaging>
+  <packaging>eclipse-plugin</packaging>
   <dependencies>  	
     <dependency>
       <groupId>kxml2</groupId>

=== modified file 'org.vcs.bazaar.eclipse.client/pom.xml'
--- org.vcs.bazaar.eclipse.client/pom.xml	2009-11-15 05:46:21 +0000
+++ org.vcs.bazaar.eclipse.client/pom.xml	2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bzr-eclipse</artifactId>
     <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
     <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <groupId>org.vcs.bazaar.eclipse</groupId>
+  <groupId>org.vcs.bazaar.eclipse.client</groupId>
   <artifactId>org.vcs.bazaar.eclipse.client</artifactId>
-  <version>0.5.3.qualifier</version>
-  <packaging>pom</packaging>
+  <version>0.5.3</version>
+  <packaging>eclipse-plugin</packaging>
   <dependencies>  	
     <dependency>
 	  <groupId>org.vcs.bazaar.client</groupId>
@@ -28,13 +29,22 @@
                         <id>copy-dependencies</id>
                         <phase>compile</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
+                            <artifactItems>
+                                <artifactItem>
+	                                <groupId>org.vcs.bazaar.client</groupId>
+                                    <artifactId>bzr-java-lib</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                </artifactItem>
+                            </artifactItems>
                         	<excludeArtifactIds>kxml2-min,xmlrpc-client,commons-logging</excludeArtifactIds>
-                            <overWriteReleases>true</overWriteReleases>
-              				<overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteReleases>false</overWriteReleases>
+              				<overWriteSnapshots>false</overWriteSnapshots>
               				<overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${basedir}</outputDirectory>
                         </configuration>
                     </execution>

=== modified file 'org.vcs.bazaar.eclipse.core.tests/pom.xml'
--- org.vcs.bazaar.eclipse.core.tests/pom.xml	2009-11-15 05:46:21 +0000
+++ org.vcs.bazaar.eclipse.core.tests/pom.xml	2011-07-20 00:07:30 +0000
@@ -2,15 +2,16 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bzr-eclipse</artifactId>
     <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
     <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <groupId>org.vcs.bazaar.eclipse</groupId>
-  <artifactId>org.vcs.bazaar.eclipse.core.tests</artifactId>
-  <version>1.1.1.qualifier</version>
-  <packaging>pom</packaging>
-    <dependencies>  	
+  <groupId>org.vcs.bazaar.eclipse.core.test</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.core.test</artifactId>
+  <version>${bzr-eclipse-version}</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <dependencies>  	
     <dependency>
 	  <groupId>org.vcs.bazaar.client</groupId>
 	  <artifactId>bzr-java-lib</artifactId>
@@ -19,28 +20,48 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  
   <build>
-	<plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <excludeArtifactIds>kxml2-min,xmlrpc,xmlrpc-client,commons-logging</excludeArtifactIds>
-                            <overWriteReleases>true</overWriteReleases>
-              				<overWriteSnapshots>true</overWriteSnapshots>
-              				<overWriteIfNewer>true</overWriteIfNewer>
-							<outputDirectory>${basedir}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-  	</plugins>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>copy-dependencies</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                        <goal>copy</goal>
+                    </goals>
+                    <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>org.vcs.bazaar.client</groupId>
+                                <artifactId>bzr-java-lib</artifactId>
+	                            <classifier>tests</classifier>
+                                <type>jar</type>
+                                <overWrite>false</overWrite>
+                            </artifactItem>
+                        </artifactItems>
+                        <excludeArtifactIds>kxml2-min,xmlrpc-client,commons-logging</excludeArtifactIds>
+                        <overWriteReleases>false</overWriteReleases>
+                        <overWriteSnapshots>false</overWriteSnapshots>
+                        <overWriteIfNewer>true</overWriteIfNewer>
+                        <excludeTransitive>true</excludeTransitive>
+                        <outputDirectory>${basedir}</outputDirectory>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>        
+		<plugin>
+			<groupId>org.sonatype.tycho</groupId>
+			<artifactId>maven-osgi-test-plugin</artifactId>
+			<configuration>
+			    <explodedBundles>
+	        	    <bundle>org.vcs.bazaar.eclipse.client</bundle>
+	          	</explodedBundles>
+	        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java	2009-09-20 06:55:23 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java	2011-07-20 00:07:30 +0000
@@ -22,6 +22,7 @@
 	@BeforeClass
 	public static void initialize() {
 		final Preferences prefs = EclipseBazaarCore.getDefault().getPluginPreferences();
+		prefs.setValue(IBazaarCoreConstants.USE_BUNDLED_PLUGINS, true);
 		if(!EclipseBazaarCore.getDefault().isClientAvailable()) {
 			BazaarUtilities.configureBazaarClient(AbstractCoreTestCase.class, "/tests.properties");
 			final BazaarClientPreferences clientPrefs = BazaarClientPreferences.getInstance();

=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java	2009-01-02 23:14:54 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java	2011-07-20 00:07:30 +0000
@@ -21,8 +21,9 @@
  * @author Guillermo Gonzalez <[e-mail]>
  *
  */
-public class TestCaseWithProject extends AbstractCoreTestCase {
+public abstract class TestCaseWithProject extends AbstractCoreTestCase {
 
+	private File testRoot; 
 	private IProject project;
 	private ExpectedWorkingTree wt;
 
@@ -40,10 +41,13 @@
         return wt;
 	}
 	
-	
 	@Before
 	public void setUp() throws Exception {
-		project = WorkspaceUtil.createProject(this.getClass().getName());
+		testRoot = File.createTempFile("bzr-eclipse", "test");
+		testRoot.delete();
+		testRoot.mkdir();
+		project = WorkspaceUtil.createProject(testRoot, this.getClass().getName());
+		System.out.println();
 		wt = createWorkingTree(project.getLocation());
 		project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
 		BazaarTeamProvider.map(project, BazaarTeamProvider.ID);
@@ -53,6 +57,7 @@
 	public void tearDown() throws Exception {
 		if(project != null)
 			project.delete(true, true, new NullProgressMonitor());
+		testRoot.delete();
 	}
 	
 	/**

=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java	2008-11-08 14:12:28 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java	2011-07-20 00:07:30 +0000
@@ -1,23 +1,28 @@
 package org.vcs.bazaar.eclipse;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
 import org.vcs.bazaar.client.testUtils.ExpectedWorkingTree;
 
 public class WorkspaceUtil {
 
-	public static IProject createProject(String name) throws CoreException {
+	public static IProject createProject(File baseDir, String name) throws CoreException {
 		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
 		IProject project = workspaceRoot.getProject(name);
 		if(project.exists()) {
 			project.delete(true, new NullProgressMonitor());
 		}
-		project.create(null);
+		IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(name);
+		desc.setLocation(new Path(baseDir.getAbsolutePath()));
+		project.create(desc, new NullProgressMonitor());
 		project.open(null);
 		return project;
 	}

=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java	2009-09-20 06:55:23 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java	2011-07-20 00:07:30 +0000
@@ -25,7 +25,8 @@
         IBazaarClient client = this.getClient();
         for(IPlugin plugin: client.plugins()) {
             if(plugin.getName().equals("xmloutput")) {
-                Assert.assertTrue(plugin.getPath().contains("org.vcs.bazaar.eclipse.client/plugins"));
+                Assert.assertTrue(plugin.getPath() + " doesn't contains org.vcs.bazaar.eclipse.client/plugins", 
+                		plugin.getPath().matches(".*/org.vcs.bazaar.eclipse.client.*/plugins/xmloutput"));
             }
         }
     }

=== removed file 'org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs'
--- org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs	2007-03-14 12:15:50 +0000
+++ org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#Wed Mar 14 08:28:52 ART 2007
-eclipse.preferences.version=1
-project.repository.kind=trac
-project.repository.url=http\://trac.steppenwolf.selfip.net/BazaarEclipse

=== added file 'org.vcs.bazaar.eclipse.core/pom.xml'
--- org.vcs.bazaar.eclipse.core/pom.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.core/pom.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.vcs.bazaar.eclipse.core</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.core</artifactId>
+  <version>${bzr-eclipse-version}</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

=== modified file 'org.vcs.bazaar.eclipse.feature/.project'
--- org.vcs.bazaar.eclipse.feature/.project	2008-04-28 03:16:18 +0000
+++ org.vcs.bazaar.eclipse.feature/.project	2011-07-20 00:07:30 +0000
@@ -1,17 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.vcs.bazaar.eclipse.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.vcs.bazaar.eclipse.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

=== added file 'org.vcs.bazaar.eclipse.feature/pom.xml'
--- org.vcs.bazaar.eclipse.feature/pom.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.feature/pom.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.vcs.bazaar.eclipse.feature</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.feature</artifactId>
+  <version>${bzr-eclipse-version}</version>
+  <packaging>eclipse-feature</packaging>
+</project>

=== added directory 'org.vcs.bazaar.eclipse.site'
=== added file 'org.vcs.bazaar.eclipse.site/.project'
--- org.vcs.bazaar.eclipse.site/.project	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/.project	2011-07-20 00:07:30 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.vcs.bazaar.eclipse.site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>

=== added file 'org.vcs.bazaar.eclipse.site/pom.xml'
--- org.vcs.bazaar.eclipse.site/pom.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/pom.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.vcs.bazaar.eclipse.site</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.site</artifactId>
+  <version>${bzr-eclipse-version}</version>
+  <packaging>eclipse-update-site</packaging>
+</project>

=== added file 'org.vcs.bazaar.eclipse.site/site.xml'
--- org.vcs.bazaar.eclipse.site/site.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/site.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description url="http://verterok.com.ar/bzr-eclipse/update-site/">
+      Update site for the Eclipse plugin for Bazaar
+   </description>
+   <feature url="features/org.vcs.bazaar.eclipse.feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.feature" version="1.1.1.qualifier">
+      <category name="bzr-eclipse (dev snapshot)"/>
+   </feature>
+   <!--feature url="features/org.vcs.bazaar.eclipse.tests-feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.tests-feature" version="1.1.1.qualifier">
+      <category name="bzr-eclipse (dev snapshot)"/>
+   </feature-->
+   <category-def name="bzr-eclipse (dev snapshot)" label="bzr-eclipse (Eclipse-3.3 dev snapshot)">
+      <description>
+         Here you can find snapshots of the current development trunk.
+      </description>
+   </category-def>
+</site>

=== modified file 'org.vcs.bazaar.eclipse.tests-feature/.project'
--- org.vcs.bazaar.eclipse.tests-feature/.project	2008-10-26 21:07:09 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/.project	2011-07-20 00:07:30 +0000
@@ -6,12 +6,18 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.pde.FeatureBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>

=== modified file 'org.vcs.bazaar.eclipse.tests-feature/feature.xml'
--- org.vcs.bazaar.eclipse.tests-feature/feature.xml	2009-01-17 22:56:14 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/feature.xml	2011-07-20 00:07:30 +0000
@@ -39,7 +39,7 @@
    </requires>
 
    <plugin
-         id="org.vcs.bazaar.eclipse.core.test"
+         id="org.vcs.bazaar.eclipse.core.tests"
          download-size="0"
          install-size="0"
          version="0.0.0"

=== added file 'org.vcs.bazaar.eclipse.tests-feature/pom.xml'
--- org.vcs.bazaar.eclipse.tests-feature/pom.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/pom.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
+    <version>${currentVersion}</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.vcs.bazaar.eclipse.tests-feature</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.tests-feature</artifactId>
+  <version>1.1.1-SNAPSHOT</version>
+  <packaging>eclipse-test-feature</packaging>
+</project>

=== removed file 'org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs'
--- org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs	2007-03-14 12:15:50 +0000
+++ org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#Wed Mar 14 09:01:13 ART 2007
-eclipse.preferences.version=1
-project.repository.kind=trac
-project.repository.url=http\://trac.steppenwolf.selfip.net/BazaarEclipse

=== added file 'org.vcs.bazaar.eclipse.ui/pom.xml'
--- org.vcs.bazaar.eclipse.ui/pom.xml	1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/pom.xml	2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  <groupId>org.vcs.bazaar.eclipse.ui</groupId>
+  <artifactId>org.vcs.bazaar.eclipse.ui</artifactId>
+  <version>${bzr-eclipse-version}</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

=== modified file 'pom.xml'
--- pom.xml	2009-09-05 15:06:07 +0000
+++ pom.xml	2011-07-20 00:07:30 +0000
@@ -1,29 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
   <groupId>org.vcs.bazaar.eclipse</groupId>
-  <artifactId>bzr-eclipse</artifactId>
+  <artifactId>org.vcs.bazaar.eclipse</artifactId>
   <version>1.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
-    <scm>
-        <connection>scm:bazaar:lp:bzr-eclipse</connection>
-        <url>http://code.launchpad.net/bzr-eclipse</url>
-    </scm>
-    <issueManagement>
-        <system>Launchpad</system>
-        <url>http://bugs.launchpad.net/bzr-eclipse</url>
-    </issueManagement>
-    <repositories>
-        <repository>
-            <id>verterok-mvn-repo</id>
-            <url>http://verterok.com.ar/maven-repo/</url>
-        </repository>
-    </repositories>
+  <scm>
+    <connection>scm:bazaar:lp:bzr-eclipse</connection>
+    <url>http://code.launchpad.net/bzr-eclipse</url>
+  </scm>
+  <issueManagement>
+    <system>Launchpad</system>
+    <url>http://bugs.launchpad.net/bzr-eclipse</url>
+  </issueManagement>
+  <properties>
+    <bzr-eclipse-version>1.1.1-SNAPSHOT</bzr-eclipse-version>
+    <tycho-version>0.10.0</tycho-version>
+    <platform-version-name>helios</platform-version-name>
+    <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
+    <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
+    <swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
+    <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</orbit-site>
+  </properties>
+
   <modules>
-    <module>org.vcs.bazaar.eclipse.client</module>
-    <module>org.vcs.bazaar.eclipse.core.tests</module>
     <module>org.apache.commons.logging</module>
     <module>org.kxml2</module>
     <module>redstone.xmlrpc</module>
+    <module>org.vcs.bazaar.eclipse.client</module>
+    <module>org.vcs.bazaar.eclipse.core</module>
+    <module>org.vcs.bazaar.eclipse.core.tests</module>
+    <module>org.vcs.bazaar.eclipse.feature</module>
+    <!--module>org.vcs.bazaar.eclipse.tests-feature</module-->
+    <module>org.vcs.bazaar.eclipse.ui</module>
+    <module>org.vcs.bazaar.eclipse.site</module>
   </modules>
+
+  <repositories>
+    <repository>
+        <id>verterok-mvn-repo</id>
+        <url>http://verterok.com.ar/maven-repo/</url>
+    </repository>
+    <repository>
+      <id>helios</id>
+      <layout>p2</layout>
+      <url>${eclipse-site}</url>
+    </repository>
+    <!--repository>
+      <id>swtbot</id>
+      <layout>p2</layout>
+      <url>${swtbot-site}</url>
+    </repository>
+    <repository>
+      <id>wikitext</id>
+      <layout>p2</layout>
+      <url>${wikitext-site}</url>
+    </repository-->
+    <repository>
+      <id>orbit</id>
+      <layout>p2</layout>
+      <url>${orbit-site}</url>
+    </repository>
+  </repositories>
+
+  <!--build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-resources-plugin</artifactId>
+              <version>2.4.1</version>
+              <configuration>
+                  <encoding>UTF-8</encoding>
+              </configuration>
+          </plugin>
+          < !-plugin>
+              <groupId>org.sonatype.tycho</groupId>
+              <artifactId>maven-osgi-compiler-plugin</artifactId>
+              <version>${tycho-version}</version>
+              <configuration>
+                  <encoding>UTF-8</encoding>
+              </configuration>
+          </plugin->
+          <plugin>
+              <groupId>org.sonatype.tycho</groupId>
+              <artifactId>maven-osgi-lifecycle-plugin</artifactId>
+              <version>1.0-SNAPSHOT</version>
+              <inherited>true</inherited>
+              <extensions>true</extensions>
+          </plugin>
+   </plugins>
+   <pluginManagement>
+       <plugins>
+            <plugin>
+                <groupId>org.sonatype.tycho</groupId>
+                <artifactId>maven-osgi-packaging-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>timestamp</id>
+                    <phase>validate</phase>
+                    <goals>
+                      <goal>timestamp</goal>
+                    </goals>
+                  </execution>
+                </executions>
+           </plugin>
+        </plugins-->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <resolver>p2</resolver>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonatype.tycho</groupId>
+          <artifactId>maven-osgi-compiler-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <encoding>UTF-8</encoding>
+          </configuration>
+        </plugin>
+        <plugin>
+          <!-- TODO remove workaround when
+             https://issues.sonatype.org/browse/TYCHO-473
+             is fixed -->
+          <groupId>org.sonatype.tycho</groupId>
+          <artifactId>maven-osgi-source-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <executions>
+            <execution>
+              <id>attach-source</id>
+              <phase>process-classes</phase>
+              <goals>
+                <goal>plugin-source</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+     </pluginManagement>
+  </build>
 </project>

=== modified file 'redstone.xmlrpc/pom.xml'
--- redstone.xmlrpc/pom.xml	2009-11-15 05:46:21 +0000
+++ redstone.xmlrpc/pom.xml	2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bzr-eclipse</artifactId>
     <groupId>org.vcs.bazaar.eclipse</groupId>
+    <artifactId>org.vcs.bazaar.eclipse</artifactId>
     <version>1.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>redstone.xmlrpc</groupId>
   <artifactId>redstone.xmlrpc</artifactId>
-  <version>1.1.1-r35</version>
-  <packaging>pom</packaging>
+  <version>1.1.1.35</version>
+  <packaging>eclipse-plugin</packaging>
   <dependencies>  	
     <dependency>
       <groupId>redstone</groupId>